--- a/servo/components/style/restyle_hints.rs
+++ b/servo/components/style/restyle_hints.rs
@@ -17,16 +17,17 @@ use selector_parser::{AttrValue, NonTSPs
 use selectors::{Element, MatchAttr};
 use selectors::matching::{ElementSelectorFlags, StyleRelations};
 use selectors::matching::matches_selector;
 use selectors::parser::{AttrSelector, Combinator, Component, Selector};
 use selectors::parser::{SelectorInner, SelectorMethods};
 use selectors::visitor::SelectorVisitor;
 use smallvec::SmallVec;
 use std::borrow::Borrow;
+use std::cell::Cell;
 use std::clone::Clone;
 use stylist::SelectorMap;
 
 bitflags! {
     /// When the ElementState of an element (like IN_HOVER_STATE) changes,
     /// certain pseudo-classes (like :hover) may require us to restyle that
     /// element, its siblings, and/or its descendants. Similarly, when various
     /// attributes of an element change, we may also need to restyle things with
@@ -189,38 +190,47 @@ pub trait ElementSnapshot : Sized + Matc
     fn each_class<F>(&self, F)
         where F: FnMut(&Atom);
 }
 
 struct ElementWrapper<'a, E>
     where E: TElement,
 {
     element: E,
+    cached_snapshot: Cell<Option<&'a Snapshot>>,
     snapshot_map: &'a SnapshotMap,
 }
 
 impl<'a, E> ElementWrapper<'a, E>
     where E: TElement,
 {
     /// Trivially constructs an `ElementWrapper`.
     fn new(el: E, snapshot_map: &'a SnapshotMap) -> Self {
-        ElementWrapper { element: el, snapshot_map: snapshot_map }
+        ElementWrapper {
+            element: el,
+            cached_snapshot: Cell::new(None),
+            snapshot_map: snapshot_map,
+        }
     }
 
     /// Gets the snapshot associated with this element, if any.
-    ///
-    /// TODO(emilio): If the hash table lookup happens to appear in profiles, we
-    /// can cache the snapshot in a RefCell<&'a Snapshot>.
     fn snapshot(&self) -> Option<&'a Snapshot> {
         if !self.element.has_snapshot() {
-            return None
+            return None;
+        }
+
+        if let Some(s) = self.cached_snapshot.get() {
+            return Some(s);
         }
 
         let snapshot = self.snapshot_map.get(&self.element);
         debug_assert!(snapshot.is_some(), "has_snapshot lied!");
+
+        self.cached_snapshot.set(snapshot);
+
         snapshot
     }
 }
 
 impl<'a, E> MatchAttr for ElementWrapper<'a, E>
     where E: TElement,
 {
     type Impl = SelectorImpl;