diff --git a/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java b/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
index 04179e2f8bca..4c1e83531161 100644
--- a/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
@@ -157,6 +157,7 @@ public abstract class ComponentManagerImpl extends UserDataHolderBase implements
         LOG.error(e);
       }
     }
+    myBaseComponents.clear();
 
     myComponentConfigCount = -1;
   }
@@ -313,6 +314,10 @@ public abstract class ComponentManagerImpl extends UserDataHolderBase implements
     }
 
     myPicoContainer = null;
+    //noinspection SynchronizeOnThis
+    synchronized (this) {
+      myNameToComponent.clear();
+    }
   }
 
   @Override