Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 2458)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 2459)
@@ -617,5 +617,4 @@
             keys.put(key, value);
         }
-        mappaintStyle = null;
         keysChangedImpl();
     }
@@ -632,5 +631,4 @@
             }
         }
-        mappaintStyle = null;
         keysChangedImpl();
     }
@@ -643,5 +641,4 @@
     public final void removeAll() {
         keys = null;
-        mappaintStyle = null;
         keysChangedImpl();
     }
@@ -787,4 +784,5 @@
 
     private void keysChangedImpl() {
+        clearCached();
         updateHasDirectionKeys();
         updateTagged();