diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java
index d985fc845f49..290e0f6a5e92 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java
@@ -295,6 +295,12 @@ public abstract class GrTypeDefinitionImpl extends GrStubElementBase<GrTypeDefin
     return myCache.getCodeMethods();
   }
 
+  @Override
+  public void subtreeChanged() {
+    myCache.dropCaches();
+    super.subtreeChanged();
+  }
+
   @NotNull
   @Override
   public PsiMethod[] getConstructors() {
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionMembersCache.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionMembersCache.java
index 9e7ad1051074..9cbd5889d0fb 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionMembersCache.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionMembersCache.java
@@ -15,6 +15,7 @@
  */
 package org.jetbrains.plugins.groovy.lang.psi.impl.statements.typedef;
 
+import com.intellij.openapi.util.SimpleModificationTracker;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiClassType;
 import com.intellij.psi.PsiMethod;
@@ -30,16 +31,17 @@ import org.jetbrains.plugins.groovy.lang.psi.util.GrClassImplUtil;
 import org.jetbrains.plugins.groovy.transformations.TransformationResult;
 import org.jetbrains.plugins.groovy.transformations.TransformationUtilKt;
 
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 
 import static com.intellij.psi.util.PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT;
 
 public class GrTypeDefinitionMembersCache<T extends GrTypeDefinition> {
 
+  private final SimpleModificationTracker myTreeChangeTracker = new SimpleModificationTracker();
   private final T myDefinition;
   private final GrCodeMembersProvider<? super T> myCodeMembersProvider;
-  private final Collection<?> myDependencies = Collections.singletonList(JAVA_STRUCTURE_MODIFICATION_COUNT);
+  private final Collection<?> myDependencies = Arrays.asList(myTreeChangeTracker, JAVA_STRUCTURE_MODIFICATION_COUNT);
 
   public GrTypeDefinitionMembersCache(@NotNull T definition) {
     this(definition, BodyCodeMembersProvider.INSTANCE);
@@ -50,6 +52,10 @@ public class GrTypeDefinitionMembersCache<T extends GrTypeDefinition> {
     myCodeMembersProvider = provider;
   }
 
+  public void dropCaches() {
+    myTreeChangeTracker.incModificationCount();
+  }
+
   public GrTypeDefinition[] getCodeInnerClasses() {
     return CachedValuesManager.getCachedValue(myDefinition, () -> CachedValueProvider.Result.create(
       myCodeMembersProvider.getCodeInnerClasses(myDefinition), myDependencies