diff --git a/pom.xml b/pom.xml
index 9a34ed0afe..f2a53f38b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,9 +7,6 @@
     <groupId>com.baeldung</groupId>
     <artifactId>parent-modules</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <modules>
-        <module>spring-webflux-caching</module>
-    </modules>
     <name>parent-modules</name>
     <packaging>pom</packaging>
 
diff --git a/spring-5-webflux/pom.xml b/spring-5-webflux/pom.xml
index 69de83c227..cd3564d404 100644
--- a/spring-5-webflux/pom.xml
+++ b/spring-5-webflux/pom.xml
@@ -66,11 +66,31 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.projectreactor.addons</groupId>
+            <artifactId>reactor-extra</artifactId>
+            <version>3.4.5</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+            <version>3.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb-reactive</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>mongodb</artifactId>
+            <version>1.16.2</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
diff --git a/spring-webflux-caching/src/main/java/com/baeldung/caching/Item.java b/spring-5-webflux/src/main/java/com/baeldung/spring/caching/Item.java
similarity index 96%
rename from spring-webflux-caching/src/main/java/com/baeldung/caching/Item.java
rename to spring-5-webflux/src/main/java/com/baeldung/spring/caching/Item.java
index 127975b0e7..7b79ff7503 100644
--- a/spring-webflux-caching/src/main/java/com/baeldung/caching/Item.java
+++ b/spring-5-webflux/src/main/java/com/baeldung/spring/caching/Item.java
@@ -1,4 +1,4 @@
-package com.baeldung.caching;
+package com.baeldung.spring.caching;
 
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
diff --git a/spring-webflux-caching/src/main/java/com/baeldung/caching/ItemRepository.java b/spring-5-webflux/src/main/java/com/baeldung/spring/caching/ItemRepository.java
similarity index 85%
rename from spring-webflux-caching/src/main/java/com/baeldung/caching/ItemRepository.java
rename to spring-5-webflux/src/main/java/com/baeldung/spring/caching/ItemRepository.java
index a76489623e..27c97de36a 100644
--- a/spring-webflux-caching/src/main/java/com/baeldung/caching/ItemRepository.java
+++ b/spring-5-webflux/src/main/java/com/baeldung/spring/caching/ItemRepository.java
@@ -1,4 +1,4 @@
-package com.baeldung.caching;
+package com.baeldung.spring.caching;
 
 import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
 import org.springframework.stereotype.Repository;
diff --git a/spring-webflux-caching/src/main/java/com/baeldung/caching/ItemService.java b/spring-5-webflux/src/main/java/com/baeldung/spring/caching/ItemService.java
similarity index 96%
rename from spring-webflux-caching/src/main/java/com/baeldung/caching/ItemService.java
rename to spring-5-webflux/src/main/java/com/baeldung/spring/caching/ItemService.java
index 9dc9ba1642..b24b54521e 100644
--- a/spring-webflux-caching/src/main/java/com/baeldung/caching/ItemService.java
+++ b/spring-5-webflux/src/main/java/com/baeldung/spring/caching/ItemService.java
@@ -1,4 +1,4 @@
-package com.baeldung.caching;
+package com.baeldung.spring.caching;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
diff --git a/spring-webflux-caching/src/main/java/com/baeldung/caching/SpringWebfluxCachingApplication.java b/spring-5-webflux/src/main/java/com/baeldung/spring/caching/SpringWebfluxCachingApplication.java
similarity index 93%
rename from spring-webflux-caching/src/main/java/com/baeldung/caching/SpringWebfluxCachingApplication.java
rename to spring-5-webflux/src/main/java/com/baeldung/spring/caching/SpringWebfluxCachingApplication.java
index 7331576bd5..5266e33775 100644
--- a/spring-webflux-caching/src/main/java/com/baeldung/caching/SpringWebfluxCachingApplication.java
+++ b/spring-5-webflux/src/main/java/com/baeldung/spring/caching/SpringWebfluxCachingApplication.java
@@ -1,4 +1,4 @@
-package com.baeldung.caching;
+package com.baeldung.spring.caching;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-webflux-caching/src/main/resources/application.properties b/spring-5-webflux/src/main/resources/application-cache.properties
similarity index 100%
rename from spring-webflux-caching/src/main/resources/application.properties
rename to spring-5-webflux/src/main/resources/application-cache.properties
diff --git a/spring-webflux-caching/src/test/java/com/baeldung/caching/MonoFluxResultCachingLiveTest.java b/spring-5-webflux/src/test/java/com/baeldung/spring/caching/MonoFluxResultCachingLiveTest.java
similarity index 96%
rename from spring-webflux-caching/src/test/java/com/baeldung/caching/MonoFluxResultCachingLiveTest.java
rename to spring-5-webflux/src/test/java/com/baeldung/spring/caching/MonoFluxResultCachingLiveTest.java
index bf96b35dcb..322b3c5aa5 100644
--- a/spring-webflux-caching/src/test/java/com/baeldung/caching/MonoFluxResultCachingLiveTest.java
+++ b/spring-5-webflux/src/test/java/com/baeldung/spring/caching/MonoFluxResultCachingLiveTest.java
@@ -1,11 +1,10 @@
-package com.baeldung.caching;
+package com.baeldung.spring.caching;
 
 
-import org.assertj.core.api.Assertions;
-import org.junit.ClassRule;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
 import org.testcontainers.containers.MongoDBContainer;
@@ -15,6 +14,7 @@ import reactor.core.publisher.Mono;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest
+@ActiveProfiles("cache")
 public class MonoFluxResultCachingLiveTest {
 
 
diff --git a/spring-webflux-caching/pom.xml b/spring-webflux-caching/pom.xml
deleted file mode 100644
index ed9800bce9..0000000000
--- a/spring-webflux-caching/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung.spring</groupId>
-    <artifactId>spring-webflux-caching</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <name>spring-webflux-caching</name>
-    <packaging>jar</packaging>
-    <description>Spring WebFlux Caching Sample</description>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
-    </parent>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.reactivex.rxjava2</groupId>
-            <artifactId>rxjava</artifactId>
-            <version>2.2.19</version>
-        </dependency>
-        <dependency>
-            <groupId>io.projectreactor.addons</groupId>
-            <artifactId>reactor-extra</artifactId>
-            <version>3.4.5</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.ben-manes.caffeine</groupId>
-            <artifactId>caffeine</artifactId>
-            <version>3.0.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-mongodb-reactive</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.projectreactor</groupId>
-            <artifactId>reactor-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>mongodb</artifactId>
-            <version>1.16.2</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
\ No newline at end of file