diff --git a/spring-test/src/main/java/org/springframework/test/context/TestContextAnnotationUtils.java b/spring-test/src/main/java/org/springframework/test/context/TestContextAnnotationUtils.java
index ac6087c4688..0b1ecee6575 100644
--- a/spring-test/src/main/java/org/springframework/test/context/TestContextAnnotationUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/context/TestContextAnnotationUtils.java
@@ -75,7 +75,7 @@ public abstract class TestContextAnnotationUtils {
 	private static final ConcurrentLruCache<Class<?>, EnclosingConfiguration> cachedEnclosingConfigurationModes =
 			new ConcurrentLruCache<>(32, TestContextAnnotationUtils::lookUpEnclosingConfiguration);
 
-	private static EnclosingConfiguration defaultEnclosingConfigurationMode;
+	private static volatile EnclosingConfiguration defaultEnclosingConfigurationMode;
 
 	/**
 	 * Find the first annotation of the specified {@code annotationType} within
diff --git a/spring-test/src/test/java/org/springframework/test/context/TestContextAnnotationUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/TestContextAnnotationUtilsTests.java
index 43ec387a775..160cf4f3f30 100644
--- a/spring-test/src/test/java/org/springframework/test/context/TestContextAnnotationUtilsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/TestContextAnnotationUtilsTests.java
@@ -57,6 +57,7 @@ class TestContextAnnotationUtilsTests {
 	class SearchEnclosingClassTests {
 
 		@BeforeEach
+		@AfterEach
 		void clearCaches() {
 			TestContextAnnotationUtils.clearCaches();
 		}