diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCliCommonizer.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCliCommonizer.kt
index 2d4b9874457..feedf977bd3 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCliCommonizer.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCliCommonizer.kt
@@ -20,8 +20,14 @@ private const val KOTLIN_KLIB_COMMONIZER_EMBEDDABLE = "kotlin-klib-commonizer-em
  * when executing the commonizer (like jvm arguments, running in separate process, etc)
  */
 internal fun GradleCliCommonizer(project: Project): CliCommonizer {
+    return GradleCliCommonizer(
+        KotlinNativeCommonizerToolRunner(project)
+    )
+}
+
+internal fun GradleCliCommonizer(commonizerToolRunner: KotlinNativeCommonizerToolRunner): CliCommonizer {
     return CliCommonizer(CliCommonizer.Executor { arguments ->
-        KotlinNativeCommonizerToolRunner(project).run(arguments)
+        commonizerToolRunner.run(arguments)
     })
 }
 
@@ -31,4 +37,4 @@ internal fun Project.registerCommonizerClasspathConfigurationIfNecessary() {
             it.add(project.dependencies.create("$KOTLIN_MODULE_GROUP:$KOTLIN_KLIB_COMMONIZER_EMBEDDABLE:${getKotlinPluginVersion()}"))
         }
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/NativeDistributionCommonizerTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/NativeDistributionCommonizerTask.kt
index bd56032599d..00c7ddfd530 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/NativeDistributionCommonizerTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/NativeDistributionCommonizerTask.kt
@@ -33,21 +33,9 @@ internal open class NativeDistributionCommonizerTask : DefaultTask() {
     internal val commonizerTargets: Set<SharedCommonizerTarget>
         get() = project.getAllCommonizerTargets()
 
-    @get:Internal
-    val outputDirectories: Set<File>
-        get() {
-            val rootOutputDirectory = getRootOutputDirectory()
-            return commonizerTargets.map { target -> resolveCommonizedDirectory(rootOutputDirectory, target) }.toSet()
-        }
-
     @get:Internal
     internal val commonizerRunner = KotlinNativeCommonizerToolRunner(project)
 
-    @get:Classpath
-    @Suppress("unused") // Only for up-to-date checker.
-    internal val commonizerClasspath: Set<File>
-        get() = commonizerRunner.classpath
-
     @get:Input
     @Suppress("unused") // Only for up-to-date checker.
     internal val commonizerJvmArgs: List<String>
@@ -65,7 +53,7 @@ internal open class NativeDistributionCommonizerTask : DefaultTask() {
 
     @TaskAction
     protected fun run() {
-        NativeDistributionCommonizationCache(project, GradleCliCommonizer(project)).commonizeNativeDistribution(
+        NativeDistributionCommonizationCache(project, GradleCliCommonizer(commonizerRunner)).commonizeNativeDistribution(
             konanHome = konanHome,
             outputDirectory = getRootOutputDirectory(),
             outputTargets = project.getAllCommonizerTargets(),