diff --git a/platformLibs/build.gradle b/platformLibs/build.gradle
index c1cfa722141..a6dae9b3df4 100644
--- a/platformLibs/build.gradle
+++ b/platformLibs/build.gradle
@@ -65,7 +65,7 @@ project.rootProject.ext.platformManager.enabled.each { target ->
         task "${targetName}StdlibCache"(type: KonanCacheTask) {
             it.target = targetName
             originalKlib = file("$konanHome/klib/common/stdlib")
-            cacheDirectory = file("$konanHome/klib/cache/$targetName-g")
+            cacheRoot = file("$konanHome/klib/cache")
 
             dependsOn ":${targetName}CrossDist"
         }
@@ -106,7 +106,7 @@ project.rootProject.ext.platformManager.enabled.each { target ->
             task "${libName}Cache"(type: KonanCacheTask) {
                 it.target = targetName
                 originalKlib = tasks[libName].installDir
-                cacheDirectory = file("$konanHome/klib/cache/$targetName-g")
+                cacheRoot = file("$konanHome/klib/cache")
 
                 dependsOn "${targetName}StdlibCache"
                 dependsOn tasks[libName]
diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCacheTask.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCacheTask.kt
index de243f87aee..d6895edc4c3 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCacheTask.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCacheTask.kt
@@ -3,10 +3,8 @@ package org.jetbrains.kotlin.gradle.plugin.konan.tasks
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.*
 import org.jetbrains.kotlin.gradle.plugin.konan.KonanCompilerRunner
-import org.jetbrains.kotlin.gradle.plugin.tasks.KonanTargetableTask
 import org.jetbrains.kotlin.konan.target.CompilerOutputKind
 import org.jetbrains.kotlin.konan.target.HostManager
-import org.jetbrains.kotlin.konan.target.KonanTarget
 import java.io.File
 
 enum class KonanCacheKind(val outputKind: CompilerOutputKind) {
@@ -20,11 +18,16 @@ open class KonanCacheTask: DefaultTask() {
 
     // Taken into account by the [cacheFile] property.
     @Internal
-    lateinit var cacheDirectory: File
+    lateinit var cacheRoot: File
 
     @get:Input
     lateinit var target: String
 
+    @get:Internal
+    // TODO: Reuse NativeCacheKind from Big Kotlin plugin when it is available.
+    val cacheDirectory: File
+        get() = cacheRoot.resolve("$target-g$cacheKind")
+
     @get:OutputFile
     protected val cacheFile: File
         get() {