diff --git a/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionsAreaImpl.java b/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionsAreaImpl.java
index 8acb2052ab20..9575048d6c30 100644
--- a/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionsAreaImpl.java
+++ b/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionsAreaImpl.java
@@ -128,12 +128,13 @@ public class ExtensionsAreaImpl implements ExtensionsArea {
     String implClass = extensionElement.getAttributeValue("implementation");
 
     ExtensionComponentAdapter adapter;
+    final PicoContainer container = getPluginContainer(pluginId.getIdString());
     if (implClass != null) {
-      adapter = new ExtensionComponentAdapter(implClass, extensionElement, getPluginContainer(pluginId.getIdString()), pluginDescriptor, shouldDeserializeInstance(extensionElement));
+      adapter = new ExtensionComponentAdapter(implClass, extensionElement, container, pluginDescriptor, shouldDeserializeInstance(extensionElement));
     }
     else {
       final ExtensionPoint extensionPoint = getExtensionPoint(epName);
-      adapter = new ExtensionComponentAdapter(extensionPoint.getBeanClassName(), extensionElement, getPluginContainer(pluginId.getIdString()), pluginDescriptor, true);
+      adapter = new ExtensionComponentAdapter(extensionPoint.getBeanClassName(), extensionElement, container, pluginDescriptor, true);
     }
     myExtensionElement2extension.put(extensionElement, adapter);
     internalGetPluginContainer().registerComponent(adapter);