diff --git a/pom.xml b/pom.xml
index fe201fee89..dc2156faf8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -822,7 +822,7 @@
                 <module>spring-actuator</module>
                 <module>spring-ai</module>
                 <module>spring-aop-2</module>
-                <!--<module>spring-aop</module>--><!-- JAVA-30541 -->
+                <module>spring-aop</module>
                 <module>spring-batch-2</module>
                 <module>spring-batch</module>
                 <module>spring-boot-modules</module>
@@ -1063,7 +1063,7 @@
                 <module>spring-actuator</module>
                 <module>spring-ai</module>
                 <module>spring-aop-2</module>
-                <!--<module>spring-aop</module>--><!-- JAVA-30541 -->
+                <module>spring-aop</module>
                 <module>spring-batch-2</module>
                 <module>spring-batch</module>
                 <module>spring-boot-modules</module>
diff --git a/spring-aop/pom.xml b/spring-aop/pom.xml
index 8ff5f20126..2805ec0d45 100644
--- a/spring-aop/pom.xml
+++ b/spring-aop/pom.xml
@@ -86,6 +86,7 @@
 
     <properties>
         <aspectj-plugin.version>1.14.0</aspectj-plugin.version>
+        <java.version>16</java.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-aop/src/test/java/com/baeldung/joinpoint/JoinPointAroundCacheAspectIntegrationTest.java b/spring-aop/src/test/java/com/baeldung/joinpoint/JoinPointAroundCacheAspectIntegrationTest.java
index 4bd8f2ad8e..750f036fdf 100644
--- a/spring-aop/src/test/java/com/baeldung/joinpoint/JoinPointAroundCacheAspectIntegrationTest.java
+++ b/spring-aop/src/test/java/com/baeldung/joinpoint/JoinPointAroundCacheAspectIntegrationTest.java
@@ -1,5 +1,6 @@
 package com.baeldung.joinpoint;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +22,10 @@ public class JoinPointAroundCacheAspectIntegrationTest {
     @Autowired
     private ArticleService articleService;
 
+    @Before
+    public void removeCache() {
+        JoinPointAroundCacheAspect.CACHE.clear();
+    }
     @Test
     public void shouldPopulateCache() {
         assertTrue(JoinPointAroundCacheAspect.CACHE.isEmpty());