diff --git a/modules/graphics/src/main/java/com/sun/javafx/css/StyleManager.java b/modules/graphics/src/main/java/com/sun/javafx/css/StyleManager.java
--- a/modules/graphics/src/main/java/com/sun/javafx/css/StyleManager.java
+++ b/modules/graphics/src/main/java/com/sun/javafx/css/StyleManager.java
@@ -535,16 +535,9 @@
 
         synchronized (styleLock) {
             // RT-34863 - clean up CSS cache when Parent is removed from scene-graph
-            Set<Entry<Parent, CacheContainer>> entrySet = cacheContainerMap.entrySet();
-            Iterator<Entry<Parent, CacheContainer>> iterator = entrySet.iterator();
-            while (iterator.hasNext()) {
-                Entry<Parent, CacheContainer> entry = iterator.next();
-                Parent key = entry.getKey();
-                CacheContainer container = entry.getValue();
-                if (parent == key) {
-                    iterator.remove();
-                    container.clearCache();
-                }
+            if (cacheContainerMap.containsKey(parent)) {
+                CacheContainer container = cacheContainerMap.remove(parent);
+                container.clearCache();
             }
 
             final List<String> stylesheets = parent.getStylesheets();