Use composed cache key for different SmartFactoryBean object types

Closes gh-35974

spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerPointcut.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.orm.jpa;
+
+import java.io.Serializable;
+
+import jakarta.persistence.EntityManager;
+
+import org.springframework.aop.ClassFilter;
+import org.springframework.aop.MethodMatcher;
+import org.springframework.aop.Pointcut;
+
+/**
+ * @author Juergen Hoeller
+ */
+public class EntityManagerPointcut implements Pointcut, Serializable {
+
+	@Override
+	public ClassFilter getClassFilter() {
+		return (EntityManager.class::isAssignableFrom);
+	}
+
+	@Override
+	public MethodMatcher getMethodMatcher() {
+		return MethodMatcher.TRUE;
+	}
+
+}

spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java

@@ -23,6 +23,7 @@ import org.hibernate.SessionFactory;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.target.SingletonTargetSource;
 import org.springframework.orm.jpa.AbstractContainerEntityManagerFactoryIntegrationTests;
 import org.springframework.orm.jpa.EntityManagerFactoryInfo;
@@ -45,6 +46,11 @@ class HibernateEntityManagerFactoryIntegrationTests extends AbstractContainerEnt
 	}
 
 
+	@Test
+	void testAdvisedEntityManagerProxyFromSmartFactoryBean() {
+		assertThat(AopUtils.isAopProxy(sharedEntityManager)).isTrue();
+	}
+
 	@Test
 	void testCanCastNativeEntityManagerFactoryToHibernateEntityManagerFactoryImpl() {
 		EntityManagerFactoryInfo emfi = (EntityManagerFactoryInfo) entityManagerFactory;

spring-orm/src/test/resources/org/springframework/orm/jpa/hibernate/hibernate-manager.xml

@@ -32,4 +32,9 @@
 
 	<bean class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator"/>
 
+	<bean class="org.springframework.aop.support.DefaultPointcutAdvisor">
+		<property name="pointcut"><bean class="org.springframework.orm.jpa.EntityManagerPointcut"/></property>
+		<property name="advice"><bean class="org.springframework.aop.interceptor.SimpleTraceInterceptor"/></property>
+	</bean>
+
 </beans>