diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirIdeResolveStateService.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirIdeResolveStateService.kt
index 111ed2d5f0b..69f5e4609b5 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirIdeResolveStateService.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirIdeResolveStateService.kt
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.idea.fir.low.level.api
 
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.roots.ProjectRootModificationTracker
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo
 import org.jetbrains.kotlin.idea.caches.project.ModuleSourceInfo
@@ -24,6 +25,7 @@ internal class FirIdeResolveStateService(project: Project) {
     private val stateCache by cachedValue(
         project,
         project.service<KotlinFirOutOfBlockModificationTrackerFactory>().createProjectWideOutOfBlockModificationTracker(),
+        ProjectRootModificationTracker.getInstance(project),
     ) {
         ConcurrentHashMap<IdeaModuleInfo, FirModuleResolveStateImpl>()
     }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/KotlinFirOutOfBlockModificationTracker.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/KotlinFirOutOfBlockModificationTracker.kt
index 0b253e5ec27..51d2b77502d 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/KotlinFirOutOfBlockModificationTracker.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/KotlinFirOutOfBlockModificationTracker.kt
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.idea.fir.low.level.api.trackers
 import com.intellij.ProjectTopics
 import com.intellij.lang.ASTNode
 import com.intellij.openapi.Disposable
-import com.intellij.openapi.components.service
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.ModuleRootEvent
@@ -28,23 +27,21 @@ import org.jetbrains.kotlin.idea.util.module
 internal class KotlinFirModificationTrackerService(project: Project) : Disposable {
     init {
         PomManager.getModel(project).addModelListener(Listener())
-
-        project.messageBus.connect(this).subscribe(
-            ProjectTopics.PROJECT_ROOTS,
-            object : ModuleRootListener {
-                override fun rootsChanged(event: ModuleRootEvent) = increaseModificationCountForAllModules()
-            }
-        )
+        subscribeForRootChanges(project)
     }
 
     var projectGlobalOutOfBlockInKotlinFilesModificationCount = 0L
         private set
 
-    private val moduleModificationsState = ModuleModificationsState()
-
     fun getOutOfBlockModificationCountForModules(module: Module): Long =
         moduleModificationsState.getModificationsCountForModule(module)
 
+    @TestOnly
+    fun incrementModificationsCount() {
+        increaseModificationCountForAllModules()
+    }
+
+    private val moduleModificationsState = ModuleModificationsState()
     private val treeAspect = TreeAspect.getInstance(project)
 
     override fun dispose() {}
@@ -54,9 +51,13 @@ internal class KotlinFirModificationTrackerService(project: Project) : Disposabl
         moduleModificationsState.increaseModificationCountForAllModules()
     }
 
-    @TestOnly
-    fun incrementModificationsCount() {
-        increaseModificationCountForAllModules()
+    private fun subscribeForRootChanges(project: Project) {
+        project.messageBus.connect(this).subscribe(
+            ProjectTopics.PROJECT_ROOTS,
+            object : ModuleRootListener {
+                override fun rootsChanged(event: ModuleRootEvent) = increaseModificationCountForAllModules()
+            }
+        )
     }
 
     private inner class Listener : PomModelListener {
@@ -68,15 +69,20 @@ internal class KotlinFirModificationTrackerService(project: Project) : Disposabl
             if (changeSet.rootElement.psi.language != KotlinLanguage.INSTANCE) return
             val changedElements = changeSet.changedElements
 
+            handleChangedElementsInAllModules(changedElements, changeSet)
+        }
+
+        private fun handleChangedElementsInAllModules(
+            changedElements: Array<out ASTNode>,
+            changeSet: TreeChangeEvent
+        ) {
             var isOutOfBlockChangeInAnyModule = false
 
             changedElements.forEach { element ->
                 val isOutOfBlock = element.isOutOfBlockChange(changeSet)
                 isOutOfBlockChangeInAnyModule = isOutOfBlockChangeInAnyModule || isOutOfBlock
                 if (isOutOfBlock) {
-                    element.psi.module?.let { module ->
-                        moduleModificationsState.increaseModificationCountForModule(module)
-                    }
+                    incrementModificationTrackerForContainingModule(element)
                 }
             }
 
@@ -85,13 +91,21 @@ internal class KotlinFirModificationTrackerService(project: Project) : Disposabl
             }
         }
 
+        private fun incrementModificationTrackerForContainingModule(element: ASTNode) {
+            element.psi.module?.let { module ->
+                moduleModificationsState.increaseModificationCountForModule(module)
+            }
+        }
+
         private fun ASTNode.isOutOfBlockChange(changeSet: TreeChangeEvent): Boolean {
             val nodes = changeSet.getChangesByElement(this).affectedChildren
-            return nodes.any { node ->
-                val psi = node.psi ?: return@any true
-                val container = psi.getNonLocalContainingInBodyDeclarationWith() ?: return@any true
-                !FileElementFactory.isReanalyzableContainer(container)
-            }
+            return nodes.any(::isOutOfBlockChange)
+        }
+
+        private fun isOutOfBlockChange(node: ASTNode): Boolean {
+            val psi = node.psi ?: return true
+            val container = psi.getNonLocalContainingInBodyDeclarationWith() ?: return true
+            return !FileElementFactory.isReanalyzableContainer(container)
         }
     }
 }
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSessionProvider.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSessionProvider.kt
index 01c28dc1a79..75e6fcdad89 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSessionProvider.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSessionProvider.kt
@@ -9,6 +9,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.util.CachedValueProvider
 import com.intellij.psi.util.CachedValuesManager
 import com.intellij.psi.util.PsiModificationTracker
+import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.idea.caches.project.getModuleInfo
 import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState