diff --git a/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java b/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java
index d13c18b5dba1..4c3282ec9ed7 100644
--- a/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java
+++ b/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java
@@ -259,6 +259,9 @@ public Enhancer() {
 	public void setSuperclass(Class superclass) {
 		if (superclass != null && superclass.isInterface()) {
 			setInterfaces(new Class[]{superclass});
+			// SPRING PATCH BEGIN
+			setContextClass(superclass);
+			// SPRING PATCH END
 		}
 		else if (superclass != null && superclass.equals(Object.class)) {
 			// affects choice of ClassLoader