diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt
index 0686686d4c1..fa4f7d8740d 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt
@@ -137,7 +137,8 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService {
         val syntheticFileModule = files.map { it.getModuleInfo() }.toSet().single()
         val sdk = syntheticFileModule.sdk
         val filesModificationTracker = ModificationTracker {
-            files.sumByLong { it.outOfBlockModificationCount }
+            // TODO: Check getUserData(FILE_OUT_OF_BLOCK_MODIFICATION_COUNT) actually works
+            files.sumByLong { it.outOfBlockModificationCount + it.modificationStamp }
         }
         val dependenciesForSyntheticFileCache = listOf(PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT, filesModificationTracker)
         val debugName = "completion/highlighting in $syntheticFileModule for files ${files.joinToString { it.name }} for platform $targetPlatform"