diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/ConverterManagerImpl.java b/xml/dom-impl/src/com/intellij/util/xml/impl/ConverterManagerImpl.java
index e98007d14646..5c4a4b864cd8 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/ConverterManagerImpl.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/ConverterManagerImpl.java
@@ -72,6 +72,8 @@ public class ConverterManagerImpl implements ConverterManager {
     mySimpleConverters.put(String.class, Converter.EMPTY_CONVERTER);
     mySimpleConverters.put(Object.class, Converter.EMPTY_CONVERTER);
     mySimpleConverters.put(PathReference.class, PathReferenceConverter.INSTANCE);
+
+    DomImplementationClassEP.CONVERTER_EP_NAME.addChangeListener(() -> myConverterInstances.clear(), null);
   }
 
   protected void addConverter(Class clazz, Converter converter) {
diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java
index 91867b9c2b93..ae1167b664c3 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java
@@ -83,6 +83,8 @@ public final class DomApplicationComponent {
     myInvocationCaches.clear();
     assignabilityCache.clear();
 
+    myVisitorDescriptions.clear();
+
     registerDescriptions();
   }