diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
index b11eea61ddb..8faa3f15c23 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
+++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
@@ -224,7 +224,7 @@ public class KotlinBuilder extends ModuleLevelBuilder {
         try {
             for (ModuleBuildTarget target : chunk.getTargets()) {
                 for (String file : dirtyFilesHolder.getRemovedFiles(target)) {
-                    cache.clearPackagePartSourceData(target.getId(), new File(file));
+                    cache.clearCacheForRemovedFile(target.getId(), new File(file));
                 }
             }
 
diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt
index 6bdbf71c17b..b7915b9faca 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt
+++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt
@@ -135,6 +135,10 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache {
         return false
     }
 
+    public fun clearCacheForRemovedFile(moduleId: String, sourceFile: File) {
+        packageSourcesData.remove(getKeyForPackagePart(moduleId, sourceFile))
+    }
+
     private fun putData(moduleId: String, fqName: FqName, data: ByteArray): Boolean {
         val id = ClassOrPackageId(moduleId, fqName)
         val oldData = protoData[id]
@@ -156,19 +160,12 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache {
         return true
     }
 
-    private fun putPackagePartSourceData(moduleId: String, sourceFile: File, className: JvmClassName?) {
-        val key = moduleId + File.pathSeparator + sourceFile.getAbsolutePath()
-
-        if (className != null) {
-            packageSourcesData.put(key, className.getInternalName())
-        }
-        else {
-            packageSourcesData.remove(key)
-        }
+    private fun getKeyForPackagePart(moduleId: String, sourceFile: File): String {
+        return moduleId + File.pathSeparator + sourceFile.getAbsolutePath()
     }
 
-    public fun clearPackagePartSourceData(moduleId: String, sourceFile: File) {
-        putPackagePartSourceData(moduleId, sourceFile, null)
+    private fun putPackagePartSourceData(moduleId: String, sourceFile: File, className: JvmClassName) {
+        packageSourcesData.put(getKeyForPackagePart(moduleId, sourceFile), className.getInternalName())
     }
 
     public override fun getRemovedPackageParts(moduleId: String, compiledSourceFilesToFqName: Map<File, String>): Collection<String> {