diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java
index 64289abb..43fd8da6 100644
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java
@@ -166,7 +166,8 @@ public abstract class NamedContextFactory<C extends NamedContextFactory.Specific
 			context.setClassLoader(parent.getClassLoader());
 		}
 		else {
-			context = new GenericApplicationContext();
+			context = AotDetector.useGeneratedArtifacts() ? new GenericApplicationContext()
+					: new AnnotationConfigApplicationContext();
 		}
 		context.getEnvironment().getPropertySources().addFirst(
 				new MapPropertySource(this.propertySourceName, Collections.singletonMap(this.propertyName, name)));