Merge pull request #16974 from izeye

* pr/16974:
  Use actual resolvedType when checking Binder cache

Author: philwebb

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/JavaBeanBinder.java

@@ -192,12 +192,12 @@ public BeanSupplier<T> getSupplier(Bindable<T> target) {
 			});
 		}
 
-		private boolean isOfDifferentType(ResolvableType targetType) {
+		private boolean isOfDifferentType(ResolvableType targetType,
+				Class<?> resolvedType) {
 			if (this.type.hasGenerics() || targetType.hasGenerics()) {
 				return !this.type.equals(targetType);
 			}
-			return this.resolvedType == null
-					|| !this.resolvedType.equals(targetType.resolve());
+			return this.resolvedType == null || !this.resolvedType.equals(resolvedType);
 		}
 
 		@SuppressWarnings("unchecked")
@@ -214,7 +214,7 @@ public static <T> Bean<T> get(Bindable<T> bindable, boolean canCallGetValue) {
 				return null;
 			}
 			Bean<?> bean = Bean.cached;
-			if (bean == null || bean.isOfDifferentType(type)) {
+			if (bean == null || bean.isOfDifferentType(type, resolvedType)) {
 				bean = new Bean<>(type, resolvedType);
 				cached = bean;
 			}