diff --git a/build.gradle.kts b/build.gradle.kts
index abf16ff88c6..b3afa6c8093 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -467,7 +467,7 @@ allprojects {
     }
 
     tasks.withType<Test> {
-        outputs.doNotCacheIf("https://youtrack.jetbrains.com/issue/KT-37089") { true }
+        outputs.doNotCacheIf("https://youtrack.jetbrains.com/issue/KTI-112") { !isTestDistributionEnabled() }
     }
 
     normalization {
diff --git a/buildSrc/src/main/kotlin/testDistribution.kt b/buildSrc/src/main/kotlin/testDistribution.kt
index b773e1f27b5..863cdc45704 100644
--- a/buildSrc/src/main/kotlin/testDistribution.kt
+++ b/buildSrc/src/main/kotlin/testDistribution.kt
@@ -25,3 +25,6 @@ fun Test.configureTestDistribution(configure: TestDistributionExtension.() -> Un
         configure()
     }
 }
+
+fun Test.isTestDistributionEnabled(): Boolean =
+    extensions.findByType(TestDistributionExtension::class.java)?.enabled?.orNull ?: false