diff --git a/ass2-service/auth/src/main/java/dst/ass2/service/auth/impl/CachingAuthenticationService.java b/ass2-service/auth/src/main/java/dst/ass2/service/auth/impl/CachingAuthenticationService.java
index 487f8f8..aeb4387 100644
--- a/ass2-service/auth/src/main/java/dst/ass2/service/auth/impl/CachingAuthenticationService.java
+++ b/ass2-service/auth/src/main/java/dst/ass2/service/auth/impl/CachingAuthenticationService.java
@@ -84,6 +84,7 @@ public class CachingAuthenticationService implements ICachingAuthenticationServi
     @PostConstruct
     @Override
     public void loadData() {
+        clearCache();
         for (IRider rider : daoFactory.createRiderDAO().findAll()) {
             userCache.putIfAbsent(rider.getEmail(), rider.getPassword());
         }
@@ -92,6 +93,7 @@ public class CachingAuthenticationService implements ICachingAuthenticationServi
     @Override
     public void clearCache() {
         userCache.clear();
+        tokenCache.clear();
     }
 
     private byte[] generateSHA1(String string) {