diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BytecodeProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BytecodeProviderImpl.java
index d5088c0424db..00b46fda0167 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BytecodeProviderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BytecodeProviderImpl.java
@@ -18,7 +18,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Callable;
 
 import org.hibernate.HibernateException;
 import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl;
@@ -184,7 +183,7 @@ public ReflectionOptimizer getReflectionOptimizer(
 				.method( setPropertyValuesMethodName )
 				.intercept( new Implementation.Simple( new SetPropertyValues( clazz, getterNames, setters ) ) )
 				.method( getPropertyNamesMethodName )
-				.intercept( MethodCall.call( new CloningPropertyCall( getterNames ) ) )
+				.intercept( new Implementation.Simple( new GetPropertyNames( getterNames ) ) )
 		);
 
 		try {
@@ -251,7 +250,7 @@ public ReflectionOptimizer getReflectionOptimizer(
 				.method( setPropertyValuesMethodName )
 				.intercept( new Implementation.Simple( new SetPropertyValues( clazz, propertyNames, setters ) ) )
 				.method( getPropertyNamesMethodName )
-				.intercept( MethodCall.call( new CloningPropertyCall( propertyNames ) ) )
+				.intercept( new Implementation.Simple( new GetPropertyNames( propertyNames ) ) )
 		);
 
 		try {
@@ -1293,17 +1292,29 @@ private static Constructor<?> findConstructor(Class<?> clazz) {
 		}
 	}
 
-	public static class CloningPropertyCall implements Callable<String[]> {
+	public static class GetPropertyNames implements ByteCodeAppender {
 
 		private final String[] propertyNames;
 
-		private CloningPropertyCall(String[] propertyNames) {
+		private GetPropertyNames(String[] propertyNames) {
 			this.propertyNames = propertyNames;
 		}
 
 		@Override
-		public String[] call() {
-			return propertyNames.clone();
+		public Size apply(
+				MethodVisitor methodVisitor,
+				Implementation.Context implementationContext,
+				MethodDescription instrumentedMethod) {
+			methodVisitor.visitLdcInsn( propertyNames.length );
+			methodVisitor.visitTypeInsn( Opcodes.ANEWARRAY, Type.getInternalName( String.class ) );
+			for ( int i = 0; i < propertyNames.length; i++ ) {
+				methodVisitor.visitInsn( Opcodes.DUP );
+				methodVisitor.visitLdcInsn( i );
+				methodVisitor.visitLdcInsn( propertyNames[i] );
+				methodVisitor.visitInsn( Opcodes.AASTORE );
+			}
+			methodVisitor.visitInsn( Opcodes.ARETURN );
+			return new Size( 4, instrumentedMethod.getStackSize() + 1 );
 		}
 	}