diff --git a/src/main/java/org/springframework/data/aot/ManagedTypesRegistrationAotContribution.java b/src/main/java/org/springframework/data/aot/ManagedTypesRegistrationAotContribution.java
index 5b784da99..ec1f277aa 100644
--- a/src/main/java/org/springframework/data/aot/ManagedTypesRegistrationAotContribution.java
+++ b/src/main/java/org/springframework/data/aot/ManagedTypesRegistrationAotContribution.java
@@ -22,12 +22,13 @@ import java.util.function.BiConsumer;
 
 import javax.lang.model.element.Modifier;
 
-import org.springframework.aot.generate.AccessVisibility;
+import org.springframework.aot.generate.AccessControl;
 import org.springframework.aot.generate.GeneratedMethod;
 import org.springframework.aot.generate.GenerationContext;
 import org.springframework.beans.factory.aot.BeanRegistrationAotContribution;
 import org.springframework.beans.factory.aot.BeanRegistrationCode;
 import org.springframework.beans.factory.aot.BeanRegistrationCodeFragments;
+import org.springframework.beans.factory.aot.BeanRegistrationCodeFragmentsDecorator;
 import org.springframework.beans.factory.support.InstanceSupplier;
 import org.springframework.beans.factory.support.RegisteredBean;
 import org.springframework.core.ResolvableType;
@@ -114,7 +115,7 @@ class ManagedTypesRegistrationAotContribution implements RegisteredBeanAotContri
 	 * Class used to generate the fragment of code needed to define a {@link ManagedTypes} bean from previously discovered
 	 * managed types.
 	 */
-	static class ManagedTypesInstanceCodeFragment extends BeanRegistrationCodeFragments {
+	static class ManagedTypesInstanceCodeFragment extends BeanRegistrationCodeFragmentsDecorator {
 
 		public static final ResolvableType LIST_TYPE = ResolvableType.forType(List.class);
 		public static final ResolvableType MANAGED_TYPES_TYPE = ResolvableType.forType(ManagedTypes.class);
@@ -157,7 +158,7 @@ class ManagedTypesRegistrationAotContribution implements RegisteredBeanAotContri
 		void generateInstanceFactory(Builder method) {
 
 			boolean allSourceTypesVisible = sourceTypes.stream()
-					.allMatch(it -> AccessVisibility.PUBLIC.equals(AccessVisibility.forClass(it)));
+					.allMatch(it -> AccessControl.forClass(it).isPublic());
 
 			ParameterizedTypeName targetTypeName = ParameterizedTypeName.get(InstanceSupplier.class, source.getBeanClass());
 
diff --git a/src/test/java/org/springframework/data/aot/AotTestCodeContributionBuilder.java b/src/test/java/org/springframework/data/aot/AotTestCodeContributionBuilder.java
index d26ba8879..644705b5f 100644
--- a/src/test/java/org/springframework/data/aot/AotTestCodeContributionBuilder.java
+++ b/src/test/java/org/springframework/data/aot/AotTestCodeContributionBuilder.java
@@ -21,11 +21,11 @@ import javax.lang.model.element.Modifier;
 
 import org.mockito.Mockito;
 import org.springframework.aot.test.generate.TestGenerationContext;
-import org.springframework.aot.test.generate.compile.Compiled;
-import org.springframework.aot.test.generate.compile.TestCompiler;
 import org.springframework.beans.factory.aot.BeanRegistrationAotContribution;
 import org.springframework.beans.factory.aot.BeanRegistrationCodeFragments;
 import org.springframework.beans.factory.support.InstanceSupplier;
+import org.springframework.core.test.tools.Compiled;
+import org.springframework.core.test.tools.TestCompiler;
 import org.springframework.javapoet.CodeBlock;
 import org.springframework.javapoet.MethodSpec;
 import org.springframework.javapoet.ParameterizedTypeName;
@@ -89,6 +89,6 @@ public class AotTestCodeContributionBuilder {
 
 	public void compile(Consumer<Compiled> compiled) {
 		generationContext.writeGeneratedContent();
-		TestCompiler.forSystem().withFiles(generationContext.getGeneratedFiles()).compile(compiled);
+		TestCompiler.forSystem().with(generationContext).compile(compiled);
 	}
 }