diff --git a/spring-core/graalvm/src/main/java/org/springframework/aot/graalvm/ConstantFieldSubstitutionProcessor.java b/spring-core/graalvm/src/main/java/org/springframework/aot/graalvm/ConstantFieldSubstitutionProcessor.java
index 8c0fcb50e7..6cbaed9e4a 100644
--- a/spring-core/graalvm/src/main/java/org/springframework/aot/graalvm/ConstantFieldSubstitutionProcessor.java
+++ b/spring-core/graalvm/src/main/java/org/springframework/aot/graalvm/ConstantFieldSubstitutionProcessor.java
@@ -17,8 +17,9 @@
 package org.springframework.aot.graalvm;
 
 import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.regex.Pattern;
 
 import com.oracle.graal.pointsto.infrastructure.SubstitutionProcessor;
@@ -51,43 +52,34 @@ class ConstantFieldSubstitutionProcessor extends SubstitutionProcessor {
 
 	private final ThrowawayClassLoader throwawayClassLoader;
 
-	private Map<String, ConstantReadableJavaField> cache = new HashMap<>();
+	private ConcurrentMap<String, ResolvedJavaField> cache = new ConcurrentHashMap<>();
+
+	private Set<String> ignoredFields = ConcurrentHashMap.newKeySet();
 
 
 	ConstantFieldSubstitutionProcessor(DebugContext debug, ClassLoader applicationClassLoader) {
 		this.throwawayClassLoader = new ThrowawayClassLoader(applicationClassLoader);
 	}
 
-
 	@Override
 	public ResolvedJavaField lookup(ResolvedJavaField field) {
 		ResolvedJavaType declaringClass = field.getDeclaringClass();
 		if (field.getType().getJavaKind() == JavaKind.Boolean && field.isStatic()) {
 			String fieldIdentifier = declaringClass.toJavaName() + "#" + field.getName();
 			for (Pattern pattern : patterns) {
-				if (pattern.matcher(fieldIdentifier).matches()) {
+				if (pattern.matcher(fieldIdentifier).matches() && !this.ignoredFields.contains(fieldIdentifier)) {
 					try {
-						if (this.cache.containsKey(fieldIdentifier)) {
-							ConstantReadableJavaField readableJavaField = this.cache.get(fieldIdentifier);
-							if (readableJavaField != null) {
-								return readableJavaField;
-							}
-							else {
-								return super.lookup(field);
-							}
-						}
-						JavaConstant constant = lookupConstant(declaringClass.toJavaName(), field.getName());
-						if (constant != null) {
+						return this.cache.computeIfAbsent(fieldIdentifier, key -> {
+							JavaConstant constant = lookupConstant(declaringClass.toJavaName(), field.getName());
 							// TODO Use proper logging only when --verbose is specified when https://github.com/oracle/graal/issues/4669 will be fixed
 							ConstantReadableJavaField readableJavaField = new ConstantReadableJavaField(field, constant);
-							this.cache.put(fieldIdentifier, readableJavaField);
 							System.out.println("Field " + fieldIdentifier + " set to " + constant.toValueString() + " at build time");
 							return readableJavaField;
-						}
+						});
 					}
 					catch (Throwable ex) {
+						this.ignoredFields.add(fieldIdentifier);
 						System.out.println("Processing of field " + fieldIdentifier + " skipped due the following error : " + ex.getMessage());
-						this.cache.put(fieldIdentifier, null);
 					}
 				}
 			}