diff --git a/src/main/java/com/mb/livedataservice/config/CacheConfig.java b/src/main/java/com/mb/livedataservice/config/CacheConfig.java
index db8cd83..8d1c7c5 100644
--- a/src/main/java/com/mb/livedataservice/config/CacheConfig.java
+++ b/src/main/java/com/mb/livedataservice/config/CacheConfig.java
@@ -27,21 +27,6 @@
 @EnableRedisRepositories(enableKeyspaceEvents = RedisKeyValueAdapter.EnableKeyspaceEvents.ON_STARTUP)
 public class CacheConfig {
 
-    @Bean(name = "cacheManager")
-    @ConditionalOnMissingBean(name = "cacheManager")
-    public RedisCacheManager cacheManager(RedisConnectionFactory connectionFactory) {
-        RedisCacheConfiguration expireIn1Day = RedisCacheConfiguration.defaultCacheConfig().entryTtl(Duration.ofDays(1));
-
-        Map<String, RedisCacheConfiguration> cacheConfigurations = new HashMap<>();
-
-        cacheConfigurations.put(RedisConstants.CACHE_KEY, expireIn1Day);
-
-        return RedisCacheManager.RedisCacheManagerBuilder
-                .fromConnectionFactory(connectionFactory)
-                .withInitialCacheConfigurations(cacheConfigurations)
-                .build();
-    }
-
     /*
      * If the Redis client is protected, add this config bean. Otherwise, this bean can be removed.
      *
@@ -58,4 +43,19 @@ public RedisCacheManager cacheManager(RedisConnectionFactory connectionFactory)
     public static ConfigureRedisAction configureRedisAction() {
         return ConfigureRedisAction.NO_OP;
     }
+
+    @Bean(name = "cacheManager")
+    @ConditionalOnMissingBean(name = "cacheManager")
+    public RedisCacheManager cacheManager(RedisConnectionFactory connectionFactory) {
+        RedisCacheConfiguration expireIn1Day = RedisCacheConfiguration.defaultCacheConfig().entryTtl(Duration.ofDays(1));
+
+        Map<String, RedisCacheConfiguration> cacheConfigurations = new HashMap<>();
+
+        cacheConfigurations.put(RedisConstants.CACHE_KEY, expireIn1Day);
+
+        return RedisCacheManager.RedisCacheManagerBuilder
+                .fromConnectionFactory(connectionFactory)
+                .withInitialCacheConfigurations(cacheConfigurations)
+                .build();
+    }
 }
diff --git a/src/test/java/com/mb/livedataservice/integration_tests/api/controller/TutorialControllerTest.java b/src/test/java/com/mb/livedataservice/integration_tests/api/controller/TutorialControllerTest.java
index 2eee14a..6f378a8 100644
--- a/src/test/java/com/mb/livedataservice/integration_tests/api/controller/TutorialControllerTest.java
+++ b/src/test/java/com/mb/livedataservice/integration_tests/api/controller/TutorialControllerTest.java
@@ -36,15 +36,15 @@ class TutorialControllerTest extends BaseUnitTest {
 
     @Container
     @ServiceConnection
-    private static final PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:16.1");
+    public static final GenericContainer redis = new GenericContainer(DockerImageName.parse("redis:7.2.4")).withExposedPorts(6379);
 
     @Container
     @ServiceConnection
-    public static final GenericContainer redis = new GenericContainer(DockerImageName.parse("redis:7.2.4")).withExposedPorts(6379);
+    public static final KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.5.3"));
 
     @Container
     @ServiceConnection
-    public static final KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.5.3"));
+    private static final PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:16.1");
 
     @Autowired
     private TestRestTemplate restTemplate;