diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationOptions.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationOptions.kt
index 85c7db7f9a0..a626288efee 100644
--- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationOptions.kt
+++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationOptions.kt
@@ -50,8 +50,6 @@ class IncrementalCompilationOptions(
         val modifiedFiles: List<File>?,
         val deletedFiles: List<File>?,
         val workingDir: File,
-        val customCacheVersionFileName: String,
-        val customCacheVersion: Int,
         compilerMode: CompilerMode,
         targetPlatform: CompileService.TargetPlatform,
         /** @See [ReportCategory] */
@@ -79,8 +77,6 @@ class IncrementalCompilationOptions(
                "modifiedFiles=$modifiedFiles, " +
                "deletedFiles=$deletedFiles, " +
                "workingDir=$workingDir, " +
-               "customCacheVersionFileName='$customCacheVersionFileName', " +
-               "customCacheVersion=$customCacheVersion, " +
                "multiModuleICSettings=$multiModuleICSettings, " +
                "usePreciseJavaTracking=$usePreciseJavaTracking" +
                "localStateDirs=$localStateDirs" +
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 171d8cf0b4a..33173d74afd 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
@@ -40,7 +40,6 @@ import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.incremental.multiproject.EmptyModulesApiHistory
 import org.jetbrains.kotlin.incremental.multiproject.ModulesApiHistory
-import org.jetbrains.kotlin.incremental.storage.version.CacheVersionManager
 import org.jetbrains.kotlin.load.java.JavaClassesTracker
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
 import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents
diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
index b5a4fe9598d..293f350c618 100644
--- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
@@ -46,7 +46,7 @@ import org.jetbrains.jps.util.JpsPathUtil
 import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments
 import org.jetbrains.kotlin.config.IncrementalCompilation
 import org.jetbrains.kotlin.incremental.LookupSymbol
-import org.jetbrains.kotlin.incremental.storage.version.CacheAttributesDiff
+import org.jetbrains.kotlin.jps.incremental.CacheAttributesDiff
 import org.jetbrains.kotlin.incremental.storage.version.CacheVersionManager
 import org.jetbrains.kotlin.incremental.testingUtils.*
 import org.jetbrains.kotlin.jps.build.dependeciestxt.ModulesTxt
diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
index 8bf4420fc8e..f2ac3589757 100644
--- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
@@ -59,7 +59,7 @@ import org.jetbrains.kotlin.codegen.JvmCodegenUtil
 import org.jetbrains.kotlin.config.IncrementalCompilation
 import org.jetbrains.kotlin.config.KotlinCompilerVersion.TEST_IS_PRE_RELEASE_SYSTEM_PROPERTY
 import org.jetbrains.kotlin.incremental.components.LookupTracker
-import org.jetbrains.kotlin.incremental.storage.version.CacheAttributesDiff
+import org.jetbrains.kotlin.jps.incremental.CacheAttributesDiff
 import org.jetbrains.kotlin.incremental.withIC
 import org.jetbrains.kotlin.jps.build.KotlinJpsBuildTest.LibraryDependency.*
 import org.jetbrains.kotlin.jps.model.kotlinCommonCompilerArguments
diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributesManagerTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributesManagerTest.kt
index 926105dca9c..4cbabd71dea 100644
--- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributesManagerTest.kt
+++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributesManagerTest.kt
@@ -5,8 +5,8 @@
 
 package org.jetbrains.kotlin.jps.incremental
 
-import org.jetbrains.kotlin.incremental.storage.version.CacheStatus
-import org.jetbrains.kotlin.incremental.storage.version.loadDiff
+import org.jetbrains.kotlin.jps.incremental.CacheStatus
+import org.jetbrains.kotlin.jps.incremental.loadDiff
 import org.junit.Test
 import java.io.File
 import kotlin.test.assertEquals
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt
index 626b78c4458..b28a19750d2 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt
@@ -9,7 +9,7 @@ import org.jetbrains.jps.incremental.ModuleBuildTarget
 import org.jetbrains.kotlin.config.ApiVersion
 import org.jetbrains.kotlin.config.LanguageVersion
 import org.jetbrains.kotlin.config.VersionView
-import org.jetbrains.kotlin.incremental.storage.version.CacheStatus
+import org.jetbrains.kotlin.jps.incremental.CacheStatus
 import org.jetbrains.kotlin.jps.incremental.JpsIncrementalCache
 import org.jetbrains.kotlin.jps.incremental.getKotlinCache
 import org.jetbrains.kotlin.jps.model.kotlinCompilerArguments
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt
index 1eaa8a049d6..d3030087750 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt
@@ -11,9 +11,9 @@ import org.jetbrains.jps.incremental.FSOperations
 import org.jetbrains.jps.incremental.GlobalContextKey
 import org.jetbrains.jps.incremental.fs.CompilationRound
 import org.jetbrains.kotlin.incremental.LookupSymbol
-import org.jetbrains.kotlin.incremental.storage.version.CacheAttributesDiff
-import org.jetbrains.kotlin.incremental.storage.version.CacheStatus
-import org.jetbrains.kotlin.incremental.storage.version.loadDiff
+import org.jetbrains.kotlin.jps.incremental.CacheAttributesDiff
+import org.jetbrains.kotlin.jps.incremental.CacheStatus
+import org.jetbrains.kotlin.jps.incremental.loadDiff
 import org.jetbrains.kotlin.jps.incremental.*
 import org.jetbrains.kotlin.jps.targets.KotlinTargetsIndex
 import org.jetbrains.kotlin.jps.targets.KotlinTargetsIndexBuilder
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/TestingBuildLogger.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/TestingBuildLogger.kt
index 3d9852e9237..f7911aed25c 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/TestingBuildLogger.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/TestingBuildLogger.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jps.build
 
 import org.jetbrains.jps.incremental.CompileContext
 import org.jetbrains.jps.incremental.ModuleLevelBuilder
-import org.jetbrains.kotlin.incremental.storage.version.CacheAttributesDiff
+import org.jetbrains.kotlin.jps.incremental.CacheAttributesDiff
 import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget
 import java.io.File
 
diff --git a/build-common/src/org/jetbrains/kotlin/incremental/storage/version/CacheAttributesDiff.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheAttributesDiff.kt
similarity index 95%
rename from build-common/src/org/jetbrains/kotlin/incremental/storage/version/CacheAttributesDiff.kt
rename to jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheAttributesDiff.kt
index 791ecf4301f..67773a3f925 100644
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/version/CacheAttributesDiff.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheAttributesDiff.kt
@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.incremental.storage.version
+package org.jetbrains.kotlin.jps.incremental
 
 /**
  * Diff between actual and expected cache attributes.
diff --git a/build-common/src/org/jetbrains/kotlin/incremental/storage/version/CacheAttributesManager.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheAttributesManager.kt
similarity index 97%
rename from build-common/src/org/jetbrains/kotlin/incremental/storage/version/CacheAttributesManager.kt
rename to jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheAttributesManager.kt
index 7f10891577f..3aa1d3c8db9 100644
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/version/CacheAttributesManager.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheAttributesManager.kt
@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.incremental.storage.version
+package org.jetbrains.kotlin.jps.incremental
 
 /**
  * Manages cache attributes values.
diff --git a/build-common/src/org/jetbrains/kotlin/incremental/storage/version/CacheStatus.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheStatus.kt
similarity index 91%
rename from build-common/src/org/jetbrains/kotlin/incremental/storage/version/CacheStatus.kt
rename to jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheStatus.kt
index 2463767554e..5cff0300018 100644
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/version/CacheStatus.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheStatus.kt
@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.incremental.storage.version
+package org.jetbrains.kotlin.jps.incremental
 
 /**
  * Status that is used by system to perform required actions (i.e. rebuild something, clearing caches, etc...).
diff --git a/build-common/src/org/jetbrains/kotlin/incremental/storage/version/CacheVersionManager.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt
similarity index 97%
rename from build-common/src/org/jetbrains/kotlin/incremental/storage/version/CacheVersionManager.kt
rename to jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt
index 6b4d01f17a0..5f0192aabb2 100644
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/version/CacheVersionManager.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt
@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.incremental.storage.version
+package org.jetbrains.kotlin.jps.incremental
 
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmBytecodeBinaryVersion
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributes.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributes.kt
index 5e9c6a9f16f..864d9c22f96 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributes.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributes.kt
@@ -6,9 +6,9 @@
 package org.jetbrains.kotlin.jps.incremental
 
 import org.jetbrains.annotations.TestOnly
-import org.jetbrains.kotlin.incremental.storage.version.CacheAttributesManager
-import org.jetbrains.kotlin.incremental.storage.version.CacheVersion
-import org.jetbrains.kotlin.incremental.storage.version.lookupsCacheVersionManager
+import org.jetbrains.kotlin.jps.incremental.CacheAttributesManager
+import org.jetbrains.kotlin.jps.incremental.CacheVersion
+import org.jetbrains.kotlin.jps.incremental.lookupsCacheVersionManager
 import java.io.File
 import java.io.IOException
 
diff --git a/build-common/src/org/jetbrains/kotlin/incremental/storage/version/local.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt
similarity index 89%
rename from build-common/src/org/jetbrains/kotlin/incremental/storage/version/local.kt
rename to jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt
index 344abd0c542..405793d5893 100644
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/version/local.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt
@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.incremental.storage.version
+package org.jetbrains.kotlin.jps.incremental
 
 import java.io.File
 
diff --git a/build-common/src/org/jetbrains/kotlin/incremental/storage/version/lookups.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/lookups.kt
similarity index 90%
rename from build-common/src/org/jetbrains/kotlin/incremental/storage/version/lookups.kt
rename to jps-plugin/src/org/jetbrains/kotlin/jps/incremental/lookups.kt
index 601fe404617..7c06d54a3e4 100644
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/version/lookups.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/lookups.kt
@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.incremental.storage.version
+package org.jetbrains.kotlin.jps.incremental
 
 import java.io.File
 
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinModuleBuildTarget.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinModuleBuildTarget.kt
index 69e22c38c16..3e66c6a8662 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinModuleBuildTarget.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinModuleBuildTarget.kt
@@ -27,9 +27,9 @@ import org.jetbrains.kotlin.incremental.ChangesCollector
 import org.jetbrains.kotlin.incremental.ExpectActualTrackerImpl
 import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
 import org.jetbrains.kotlin.incremental.components.LookupTracker
-import org.jetbrains.kotlin.incremental.storage.version.CacheAttributesDiff
-import org.jetbrains.kotlin.incremental.storage.version.loadDiff
-import org.jetbrains.kotlin.incremental.storage.version.localCacheVersionManager
+import org.jetbrains.kotlin.jps.incremental.CacheAttributesDiff
+import org.jetbrains.kotlin.jps.incremental.loadDiff
+import org.jetbrains.kotlin.jps.incremental.localCacheVersionManager
 import org.jetbrains.kotlin.jps.build.*
 import org.jetbrains.kotlin.jps.incremental.JpsIncrementalCache
 import org.jetbrains.kotlin.jps.model.productionOutputFilePath
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
index 85c0e819545..c46f3da8e3e 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
@@ -33,8 +33,6 @@ import org.jetbrains.kotlin.cli.common.messages.MessageRenderer
 import org.jetbrains.kotlin.config.Services
 import org.jetbrains.kotlin.daemon.client.CompileServiceSession
 import org.jetbrains.kotlin.daemon.common.*
-import org.jetbrains.kotlin.gradle.incremental.GRADLE_CACHE_VERSION
-import org.jetbrains.kotlin.gradle.incremental.GRADLE_CACHE_VERSION_FILE_NAME
 import org.jetbrains.kotlin.gradle.plugin.kotlinDebug
 import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
 import org.jetbrains.kotlin.gradle.tasks.InspectClassesForMultiModuleIC
@@ -270,8 +268,6 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil
             modifiedFiles = knownChangedFiles?.modified,
             deletedFiles = knownChangedFiles?.removed,
             workingDir = environment.workingDir,
-            customCacheVersion = GRADLE_CACHE_VERSION,
-            customCacheVersionFileName = GRADLE_CACHE_VERSION_FILE_NAME,
             reportCategories = reportCategories(verbose),
             reportSeverity = reportSeverity(verbose),
             requestedCompilationResults = arrayOf(CompilationResultCategory.IC_COMPILE_ITERATION.code),