diff --git a/spring-boot-modules/spring-boot-caching/pom.xml b/spring-boot-modules/spring-boot-caching/pom.xml
index 010e6079ae34..ec38c8c7d99b 100644
--- a/spring-boot-modules/spring-boot-caching/pom.xml
+++ b/spring-boot-modules/spring-boot-caching/pom.xml
@@ -15,10 +15,64 @@
     </parent>
 
     <dependencies>
+        <!-- 
+        1. Exclude conflicting Spring dependencies from starters.
+        We must exclude core Spring modules (like core, context, and web) from the starters
+        to prevent classpath collisions with the explicitly declared 6.2.11 versions below.
+        -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>        
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-context</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-beans</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-web</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-webmvc</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-context</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-beans</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        
+        <!-- 
+        2. Explicitly define Spring Framework dependencies at version 6.2.11 
+        (Required by user for spring-context and spring-context-support)
+        We also include spring-core, spring-beans, and spring-web/spring-webmvc 
+        explicitly to guarantee compatible versions for classes like 
+        AnnotationConfigUtils (context) and CollectionUtils (core/beans).
+        -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
@@ -30,17 +84,28 @@
             <version>6.2.11</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-cache</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>6.2.11</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>6.2.11</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
+            <version>6.2.11</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
+            <version>6.2.11</version>
         </dependency>
+
+        <!-- Other dependencies remain the same -->
+
         <dependency>
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache</artifactId>
@@ -49,6 +114,9 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
+            <!-- Note: spring-test version should be managed consistently, but we leave 
+                 it to the parent for simplicity since it's only test scoped. 
+                 If test issues arise, explicitly set the version here. -->
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/spring-boot-modules/spring-boot-featureflag-unleash/pom.xml b/spring-boot-modules/spring-boot-featureflag-unleash/pom.xml
index 0c93ce4dd977..45bd06065dfe 100644
--- a/spring-boot-modules/spring-boot-featureflag-unleash/pom.xml
+++ b/spring-boot-modules/spring-boot-featureflag-unleash/pom.xml
@@ -39,13 +39,13 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <compilerArgs>--enable-preview</compilerArgs>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <compilerArgs>--enable-preview</compilerArgs>
-                </configuration>
             </plugin>
         </plugins>
     </build>