diff --git a/build.gradle b/build.gradle
index caca1a63680..4d537acae07 100644
--- a/build.gradle
+++ b/build.gradle
@@ -500,7 +500,10 @@ targetList.each { target ->
     }
 
     task("${target}CrossDist") {
-        dependsOn "${target}CrossDistRuntime", 'distCompiler', 'commonDistRuntime', "${target}CrossDistEndorsedLibraries"
+        dependsOn "${target}CrossDistRuntime", "distCompiler", "commonDistRuntime", "${target}CrossDistEndorsedLibraries"
+        if (target in cacheableTargetNames) {
+            dependsOn "${target}StdlibCache", "${target}EndorsedCache"
+        }
     }
 
     task("${target}CrossDistEndorsedLibraries", type: Copy) {
@@ -520,11 +523,21 @@ task distPlatformLibs {
 }
 
 task dist {
-    dependsOn 'distCompiler', 'distRuntime', 'distEndorsedLibraries', 'distDef'
+    dependsOn "distCompiler",
+            "distRuntime",
+            "distEndorsedLibraries",
+            "distDef",
+            "distStdlibCache",
+            "distEndorsedCache"
 }
 
 task crossDist {
-    dependsOn 'crossDistRuntime', 'distCompiler', 'crossDistEndorsedLibraries'
+    dependsOn "distCompiler",
+            "crossDistRuntime",
+            "crossDistEndorsedLibraries",
+            "distDef",
+            "crossDistStdlibCache",
+            "crossDistEndorsedCache"
 }
 
 task bundle {
diff --git a/endorsedLibraries/build.gradle b/endorsedLibraries/build.gradle
index fc2789800d1..4e517d1a258 100644
--- a/endorsedLibraries/build.gradle
+++ b/endorsedLibraries/build.gradle
@@ -58,7 +58,7 @@ targetList.each { target ->
                 compilerDistributionPath.set(distDir)
 
                 dependsOn "${target}EndorsedLibraries"
-                dependsOn ":${target}CrossDist"
+                dependsOn ":${target}CrossDistRuntime"
                 dependsOn ":${target}StdlibCache"
 
                 cacheTask.dependsOn it
diff --git a/platformLibs/build.gradle b/platformLibs/build.gradle
index f867ece2880..e81c7b26b7a 100644
--- a/platformLibs/build.gradle
+++ b/platformLibs/build.gradle
@@ -67,7 +67,7 @@ project.rootProject.ext.platformManager.enabled.each { target ->
             originalKlib = file("$konanHome/klib/common/stdlib")
             cacheRoot = file("$konanHome/klib/cache")
 
-            dependsOn ":${targetName}CrossDist"
+            dependsOn ":${targetName}CrossDistRuntime"
         }
     }