diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/ContractVerifierExtension.groovy b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/ContractVerifierExtension.groovy
index 91eaa39f54..0976baa549 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/ContractVerifierExtension.groovy
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/ContractVerifierExtension.groovy
@@ -16,6 +16,7 @@
 
 package org.springframework.cloud.contract.verifier.plugin
 
+import groovy.transform.AutoClone
 import groovy.transform.ToString
 import org.apache.commons.logging.Log
 import org.apache.commons.logging.LogFactory
@@ -28,7 +29,8 @@ import org.springframework.cloud.contract.verifier.config.TestMode
  * @author Marcin Grzejszczak
  */
 @ToString
-class ContractVerifierExtension implements Cloneable {
+@AutoClone
+class ContractVerifierExtension {
 
 	private static final Log log = LogFactory.getLog(ContractVerifierExtension)
 
@@ -240,8 +242,9 @@ class ContractVerifierExtension implements Cloneable {
 		this.disableStubPublication = disableStubPublication
 	}
 
+	@AutoClone
 	@ToString(includeNames = true, includePackage = false)
-	static class Dependency implements Cloneable {
+	static class Dependency {
 		String groupId
 		String artifactId
 		String classifier
@@ -269,7 +272,9 @@ class ContractVerifierExtension implements Cloneable {
 		}
 	}
 
-	static class BaseClassMapping implements Cloneable {
+	@AutoClone
+	@ToString(includeNames = true, includePackage = false)
+	static class BaseClassMapping {
 		private final Map<String, String> delegate
 
 		BaseClassMapping(Map<String, String> delegate) {
@@ -284,8 +289,10 @@ class ContractVerifierExtension implements Cloneable {
 			this.delegate.putAll(mapping)
 		}
 	}
-	
-	static class ContractRepository implements Cloneable {
+
+	@AutoClone
+	@ToString(includeNames = true, includePackage = false)
+	static class ContractRepository {
 		/**
 		 * Repository URL
 		 */
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/PublishStubsToScmTask.groovy b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/PublishStubsToScmTask.groovy
index ff01af28ac..54cfe355bf 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/PublishStubsToScmTask.groovy
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/PublishStubsToScmTask.groovy
@@ -51,8 +51,7 @@ class PublishStubsToScmTask extends ConventionTask {
 	}
 
 	private ContractVerifierExtension modifyExtension() {
-		ContractVerifierExtension clone = (ContractVerifierExtension)
-				getConfigProperties().clone()
+		ContractVerifierExtension clone = getConfigProperties().clone()
 		this.closureHolder.extensionClosure.delegate = clone
 		this.closureHolder.extensionClosure.call(clone)
 		return clone