diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt
index a3b5cca9291..649bbe39177 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.jps.build
 import org.jetbrains.jps.builders.storage.BuildDataPaths
 import org.jetbrains.jps.incremental.ModuleBuildTarget
 import org.jetbrains.jps.incremental.storage.BuildDataManager
-import org.jetbrains.kotlin.jps.incremental.CACHE_DIRECTORY_NAME
+import org.jetbrains.kotlin.jps.incremental.KOTLIN_CACHE_DIRECTORY_NAME
 import java.io.File
 
 private val HAS_KOTLIN_MARKER_FILE_NAME = "has-kotlin-marker.txt"
@@ -51,7 +51,7 @@ abstract class MarkerFile(private val fileName: String, private val paths: Build
 
     private val ModuleBuildTarget.markerFile: File
         get() {
-            val directory = File(paths.getTargetDataRoot(this), CACHE_DIRECTORY_NAME)
+            val directory = File(paths.getTargetDataRoot(this), KOTLIN_CACHE_DIRECTORY_NAME)
             return File(directory, fileName)
         }
 }
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
index 3245982971d..7f4875a3b54 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
@@ -52,11 +52,7 @@ import java.io.File
 import java.security.MessageDigest
 import java.util.*
 
-internal val CACHE_DIRECTORY_NAME = "kotlin"
-
-@TestOnly
-public fun getCacheDirectoryName(): String =
-        CACHE_DIRECTORY_NAME
+val KOTLIN_CACHE_DIRECTORY_NAME = "kotlin"
 
 public class IncrementalCacheImpl(
         private val target: ModuleBuildTarget,
@@ -77,7 +73,7 @@ public class IncrementalCacheImpl(
         private val MODULE_MAPPING_FILE_NAME = "." + ModuleMapping.MAPPING_FILE_EXT
     }
 
-    private val baseDir = File(paths.getTargetDataRoot(target), CACHE_DIRECTORY_NAME)
+    private val baseDir = File(paths.getTargetDataRoot(target), KOTLIN_CACHE_DIRECTORY_NAME)
     private val cacheVersionProvider = CacheVersionProvider(paths)
 
     private val String.storageFile: File
diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt
index 110006b4079..e2b6e143e9c 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt
@@ -22,8 +22,8 @@ import org.jetbrains.jps.builders.storage.BuildDataPaths
 import org.jetbrains.kotlin.config.IncrementalCompilation
 import org.jetbrains.kotlin.jps.incremental.CacheVersion
 import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider
+import org.jetbrains.kotlin.jps.incremental.KOTLIN_CACHE_DIRECTORY_NAME
 import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget
-import org.jetbrains.kotlin.jps.incremental.getCacheDirectoryName
 import org.jetbrains.kotlin.jps.incremental.storage.BasicMapsOwner
 import org.jetbrains.kotlin.utils.Printer
 import java.io.File
@@ -95,7 +95,7 @@ public abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJps
 
         for (target in targets.sortedBy { it.presentableName }) {
             dumpCachesForTarget(p, paths, target, versions.normalVersion(target), versions.experimentalVersion(target),
-                                subdirectory = getCacheDirectoryName())
+                                subdirectory = KOTLIN_CACHE_DIRECTORY_NAME)
         }
 
         return sb.toString()