diff --git a/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt b/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt
index fba1a17e0a7..9f8bfe6f099 100644
--- a/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt
@@ -78,8 +78,7 @@ fun makeCompileServices(
 
 fun updateIncrementalCache(
         generatedFiles: List<GeneratedFile<*>>,
-        cache: IncrementalCacheImpl,
-        compiledWithErrors: Boolean
+        cache: IncrementalCacheImpl
 ): CompilationResult {
     var changesInfo = CompilationResult.NO_CHANGES
     for (generatedFile in generatedFiles) {
@@ -89,10 +88,8 @@ fun updateIncrementalCache(
         }
     }
 
-    if (!compiledWithErrors) {
-        val newChangesInfo = cache.clearCacheForRemovedClasses()
-        changesInfo += newChangesInfo
-    }
+    val newChangesInfo = cache.clearCacheForRemovedClasses()
+    changesInfo += newChangesInfo
 
     return changesInfo
 }
diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
index e830406ebf5..e009ae8a12b 100644
--- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
+++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
@@ -318,7 +318,7 @@ class IncrementalJvmCompilerRunner(
 
             allGeneratedFiles.addAll(generatedFiles)
             caches.inputsCache.registerOutputForSourceFiles(generatedFiles)
-            val compilationResult = updateIncrementalCache(generatedFiles, caches.jvmCache, compiledWithErrors = exitCode != ExitCode.OK)
+            val compilationResult = updateIncrementalCache(generatedFiles, caches.platformCache)
 
             caches.lookupCache.update(lookupTracker, sourcesToCompile, removedKotlinSources)