diff --git a/org.springframework.context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java b/org.springframework.context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java
index 2487ab6547..476590beac 100644
--- a/org.springframework.context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java
+++ b/org.springframework.context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java
@@ -21,10 +21,8 @@ import org.springframework.cache.interceptor.BeanFactoryCacheOperationSourceAdvi
 import org.springframework.cache.interceptor.CacheInterceptor;
 import org.springframework.cache.interceptor.CacheOperationSource;
 import org.springframework.context.annotation.AnnotationConfigUtils;
-import org.springframework.context.annotation.AutoProxyRegistrar;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Role;
 
 /**
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java
index f83fb781a0..4f39f7af71 100644
--- a/org.springframework.context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java
+++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java
@@ -53,6 +53,7 @@ public class AutoProxyRegistrar implements ImportBeanDefinitionRegistrar {
 					AopConfigUtils.registerAutoProxyCreatorIfNecessary(registry);
 					if ((Boolean)proxyTargetClass) {
 						AopConfigUtils.forceAutoProxyCreatorToUseClassProxying(registry);
+						return;
 					}
 				}
 			}