diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index ad713990006..29a5c622144 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -101,8 +101,9 @@ public open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments
     val srcDirsSources = HashSet<SourceDirectorySet>()
 
     override fun populateTargetSpecificArgs(args: K2JVMCompilerArguments) {
-        args.pluginClasspaths = property("compilerPluginClasspaths") as? Array<String>
-        args.pluginOptions = property("compilerPluginArguments") as? Array<String>
+        val extraProperties = getExtensions().getExtraProperties()
+        args.pluginClasspaths = extraProperties.get("compilerPluginClasspaths") as? Array<String>
+        args.pluginOptions = extraProperties.get("compilerPluginArguments") as? Array<String>
 
         if (StringUtils.isEmpty(kotlinOptions.classpath)) {
             val existingClasspathEntries = getClasspath().filter({ it != null && it.exists() })
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
index afdbb1ab685..ea9d2baa49d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
@@ -474,8 +474,9 @@ private class SubpluginEnvironment(
             }
         }
 
-        compileTask.setProperty("compilerPluginClasspaths", realPluginClasspaths.copyToArray())
-        compileTask.setProperty("compilerPluginArguments", pluginArguments.copyToArray())
+        val extraProperties = compileTask.getExtensions().getExtraProperties()
+        extraProperties.set("compilerPluginClasspaths", realPluginClasspaths.copyToArray())
+        extraProperties.set("compilerPluginArguments", pluginArguments.copyToArray())
     }
 }