diff --git a/pom.xml b/pom.xml
index 2f18f1e..928e019 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,18 +18,10 @@
         <mongodb-driver-sync.version>4.11.1</mongodb-driver-sync.version>
         <jackson-databind.version>2.16.1</jackson-databind.version>
         <log4j-core.version>2.17.2</log4j-core.version>
+        <junit-jupiter-api.version>5.10.2</junit-jupiter-api.version>
+        <cache2k-base-bom.version>1.6.0.Final</cache2k-base-bom.version>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-redis</artifactId>
-            <version>3.2.5</version>
-        </dependency>
-        <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-            <version>5.1.2</version>
-        </dependency>
         <dependency>
             <groupId>com.github.pengrad</groupId>
             <artifactId>java-telegram-bot-api</artifactId>
@@ -51,15 +43,15 @@
             <version>${jackson-databind.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.junit-pioneer</groupId>
-            <artifactId>junit-pioneer</artifactId>
-            <version>2.2.0</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter-api.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.cache2k</groupId>
             <artifactId>cache2k-base-bom</artifactId>
-            <version>1.6.0.Final</version>
+            <version>${cache2k-base-bom.version}</version>
             <type>pom</type>
         </dependency>
         <dependency>
@@ -70,7 +62,6 @@
     </dependencies>
     <build>
         <plugins>
-
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>3.7.1</version>
diff --git a/src/main/java/org/example/configs/MongoDBConfig.java b/src/main/java/org/example/configs/MongoDBConfig.java
index 45bd7d8..edd78e3 100644
--- a/src/main/java/org/example/configs/MongoDBConfig.java
+++ b/src/main/java/org/example/configs/MongoDBConfig.java
@@ -1,29 +1,29 @@
 package org.example.configs;
 
+
 import com.mongodb.ConnectionString;
+import com.mongodb.client.ChangeStreamIterable;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
-import com.mongodb.client.model.changestream.FullDocument;
-import com.mongodb.client.model.changestream.OperationType;
-import org.example.model.QuizQuestions;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.Aggregates;
+import com.mongodb.client.model.Filters;
+import org.bson.Document;
+import org.bson.conversions.Bson;
 import org.example.services.QuizService;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
-import org.springframework.data.mongodb.core.ChangeStreamOptions;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.aggregation.Aggregation;
-import org.springframework.data.mongodb.core.messaging.ChangeStreamRequest;
-import org.springframework.data.mongodb.core.messaging.DefaultMessageListenerContainer;
-import org.springframework.data.mongodb.core.messaging.Subscription;
-import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 
+import java.util.Arrays;
+import java.util.List;
+
 @Configuration
 @ComponentScan(basePackages = "org.example")
 @PropertySource("classpath:application.properties")
@@ -50,29 +50,29 @@ public MongoClient mongoClient() {
     return MongoClients.create(new ConnectionString(connectionUri));
   }
 
-  public MongoClient reconnectToDB() {
-    MongoClient currentClient = mongoClient();
-    currentClient.close();
-    return MongoClients.create(new ConnectionString(connectionUri));
-  }
-
   @Bean
-  public DefaultMessageListenerContainer messageListenerContainer(MongoTemplate mongoTemplate, QuizService quizService) {
-    DefaultMessageListenerContainer container = new DefaultMessageListenerContainer(mongoTemplate);
-    container.start();
-    ChangeStreamOptions changeStreamOptions = ChangeStreamOptions.builder()
-            .filter(Aggregation.newAggregation(Aggregation.match(Criteria.where("operationType").is(OperationType.INSERT.getValue()))))
-            .fullDocumentLookup(FullDocument.UPDATE_LOOKUP)
-            .build();
-    ChangeStreamRequest.ChangeStreamRequestOptions options = new ChangeStreamRequest.ChangeStreamRequestOptions(databaseName, "quizQuestions", changeStreamOptions);
+  public ChangeStreamIterable<Document> runEventListener(MongoTemplate mongoTemplate, QuizService quizService) {
+    MongoCollection<Document> collection = mongoTemplate.getCollection("quizQuestions");
+    List<Bson> pipeline = List.of(
+            Aggregates.match(Filters.in("operationType", Arrays.asList("insert", "delete"))));
+    ChangeStreamIterable<Document> changeStream = collection.watch(pipeline);
+    changeStream.forEach(event -> {
+      String operationType = event.getOperationTypeString();
+      if (operationType == null) {
+        return;
+      }
 
-    Subscription subscription = container.register(new ChangeStreamRequest<>(message -> {
-      QuizQuestions quizQuestions = message.getBody();
-      if (quizQuestions != null) {
-        String topic = quizQuestions.getTopicName();
-        quizService.addTopic(topic);
+      switch (operationType) {
+        case "insert" -> {
+          Document document = event.getFullDocument();
+          if (document != null && document.containsKey("topicName")) {
+            quizService.addTopic(document.getString("topicName"));
+          }
+        }
+        case "delete" -> quizService.updateTopics();
       }
-    }, options), QuizQuestions.class);
-    return container;
+
+    });
+    return changeStream;
   }
 }
diff --git a/src/main/java/org/example/services/QuizService.java b/src/main/java/org/example/services/QuizService.java
index 2bbfc46..445b39a 100644
--- a/src/main/java/org/example/services/QuizService.java
+++ b/src/main/java/org/example/services/QuizService.java
@@ -48,4 +48,8 @@ public QuizQuestions findRandomQuestionsByTopicName(String topicName, int count)
     return quizRepo.findRandomQuestionsByTopicName(topicName, count);
   }
 
+  public void updateTopics(){
+    List<String> topics = Arrays.stream(quizRepo.findAllTopic().split(",")).toList();
+    topicsCache.put("topics", topics);
+  }
 }