diff --git a/spring-core/src/main/java/org/springframework/aot/nativex/substitution/Target_ClassFinder.java b/spring-core/src/main/java/org/springframework/aot/nativex/substitution/Target_ClassFinder.java
index d3cc059e3a..921a33b4c2 100644
--- a/spring-core/src/main/java/org/springframework/aot/nativex/substitution/Target_ClassFinder.java
+++ b/spring-core/src/main/java/org/springframework/aot/nativex/substitution/Target_ClassFinder.java
@@ -23,6 +23,8 @@ import com.oracle.svm.core.annotate.TargetClass;
  * Allow to reference {@code com.sun.beans.finder.ClassFinder} from
  * {@link Target_Introspector}.
  *
+ * TODO Remove once Spring Framework requires GraalVM 23.0+, see <a href="https://github.com/oracle/graal/pull/5224">graal#5224</a>.
+ *
  * @author Sebastien Deleuze
  * @since 6.0
  */
diff --git a/spring-core/src/main/java/org/springframework/aot/nativex/substitution/Target_Introspector.java b/spring-core/src/main/java/org/springframework/aot/nativex/substitution/Target_Introspector.java
index ed98d969d0..c88d6a9367 100644
--- a/spring-core/src/main/java/org/springframework/aot/nativex/substitution/Target_Introspector.java
+++ b/spring-core/src/main/java/org/springframework/aot/nativex/substitution/Target_Introspector.java
@@ -25,6 +25,8 @@ import com.oracle.svm.core.annotate.TargetClass;
  * {@link java.beans.Introspector} substitution with a refined {@code findCustomizerClass} implementation
  * designed to avoid thousands of AWT classes to be included in the native image.
  *
+ * TODO Remove once Spring Framework requires GraalVM 23.0+, see <a href="https://github.com/oracle/graal/pull/5224">graal#5224</a>.
+ *
  * @author Sebastien Deleuze
  * @since 6.0
  */