diff --git a/gradle.properties b/gradle.properties
index 8bcd5e0..2f3fc7f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,3 @@
 org.gradle.jvmargs=-Xmx1g
 org.gradle.caching=true
+#org.gradle.configuration-cache=true FIXME `git-versioning` and `kotlin-multiplatform` are not compatible
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ccebba7..c1962a7 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradlew b/gradlew
index 79a61d4..aeb74cb 100755
--- a/gradlew
+++ b/gradlew
@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
index 47fcddd..7e3da7a 100644
--- a/plugin/build.gradle.kts
+++ b/plugin/build.gradle.kts
@@ -64,13 +64,6 @@ tasks.withType<Test> {
     useJUnitPlatform()
 }
 
-tasks.jacocoTestReport {
-    doFirst {
-        // sometimes fails with "Unable to read execution data file build/jacoco/test.exec"
-        Thread.sleep(1000)
-    }
-}
-
 tasks.check {
     dependsOn("jacocoTestReport")
 }
diff --git a/plugin/src/main/kotlin/com/github/gmazzo/gradle/plugins/BuildConfigClassSpec.kt b/plugin/src/main/kotlin/com/github/gmazzo/gradle/plugins/BuildConfigClassSpec.kt
index be2b1b0..b6b408d 100644
--- a/plugin/src/main/kotlin/com/github/gmazzo/gradle/plugins/BuildConfigClassSpec.kt
+++ b/plugin/src/main/kotlin/com/github/gmazzo/gradle/plugins/BuildConfigClassSpec.kt
@@ -6,6 +6,7 @@ import org.gradle.api.NamedDomainObjectProvider
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Nested
 import org.gradle.api.tasks.Optional
 
 interface BuildConfigClassSpec : Named {
@@ -20,7 +21,7 @@ interface BuildConfigClassSpec : Named {
     @get:Optional
     val packageName: Property<String>
 
-    @get:Input
+    @get:Nested
     val buildConfigFields: NamedDomainObjectContainer<BuildConfigField>
 
     fun className(className: String) = apply {
diff --git a/plugin/src/main/kotlin/com/github/gmazzo/gradle/plugins/BuildConfigField.kt b/plugin/src/main/kotlin/com/github/gmazzo/gradle/plugins/BuildConfigField.kt
index dc2ecd3..f6e5919 100644
--- a/plugin/src/main/kotlin/com/github/gmazzo/gradle/plugins/BuildConfigField.kt
+++ b/plugin/src/main/kotlin/com/github/gmazzo/gradle/plugins/BuildConfigField.kt
@@ -6,6 +6,9 @@ import org.gradle.api.tasks.Input
 
 interface BuildConfigField : Named {
 
+    @Input
+    override fun getName(): String
+
     @get:Input
     val type: Property<String>
 
diff --git a/plugin/src/test/kotlin/com/github/gmazzo/gradle/plugins/BuildConfigPluginTest.kt b/plugin/src/test/kotlin/com/github/gmazzo/gradle/plugins/BuildConfigPluginTest.kt
index 6005801..3f1e7c8 100644
--- a/plugin/src/test/kotlin/com/github/gmazzo/gradle/plugins/BuildConfigPluginTest.kt
+++ b/plugin/src/test/kotlin/com/github/gmazzo/gradle/plugins/BuildConfigPluginTest.kt
@@ -2,6 +2,8 @@ package com.github.gmazzo.gradle.plugins
 
 import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
+import org.gradle.tooling.internal.consumer.DefaultGradleConnector
+import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.parallel.Execution
@@ -165,6 +167,16 @@ class BuildConfigPluginTest {
         javaClass.classLoader.getResourceAsStream("testkit-gradle.properties")!!.use {
             file.outputStream().use(it::copyTo)
         }
+
+        file.appendText("org.gradle.caching=true")
+        if (configurationCache) {
+            file.appendText("org.gradle.configuration-cache=true")
+        }
+    }
+
+    @AfterAll
+    fun tearDownGradleDaemon() {
+        DefaultGradleConnector.close()
     }
 
     data class Args(
@@ -175,11 +187,12 @@ class BuildConfigPluginTest {
     ) {
 
         val projectDir =
-            File("test-project/" +
-                    "gradle-$gradleVersion/" +
-                    "kotlin-${kotlinVersion ?: "none"}/"  +
-                    (if (withPackage) "withPackage/" else "withoutPackage/")+
-                    (if (configurationCache) "withCC" else "withoutCC")
+            File(
+                "test-project/" +
+                        "gradle-$gradleVersion/" +
+                        "kotlin-${kotlinVersion ?: "none"}/" +
+                        (if (withPackage) "withPackage/" else "withoutPackage/") +
+                        (if (configurationCache) "withCC" else "withoutCC")
             )
 
     }