Index: src/main/java/org/midnightbsd/appstore/services/RedisCacheService.java
===================================================================
diff -u -N -ra2ba607b719da43d28669f1b214de7b7aa81d14b -rc1120b192f88425fb2613bdbb1d4fd158819633a
--- src/main/java/org/midnightbsd/appstore/services/RedisCacheService.java	(.../RedisCacheService.java)	(revision a2ba607b719da43d28669f1b214de7b7aa81d14b)
+++ src/main/java/org/midnightbsd/appstore/services/RedisCacheService.java	(.../RedisCacheService.java)	(revision c1120b192f88425fb2613bdbb1d4fd158819633a)
@@ -38,7 +38,7 @@
     public List<String> list() throws ServiceException {
         try {
             Set<Object> redisKeys = this.client.keys("*");
-            return (List) redisKeys.stream().map(Object::toString).collect(Collectors.toList());
+            return redisKeys.stream().map(Object::toString).collect(Collectors.toList());
         } catch (Exception var2) {
             log.error(var2.getMessage(), var2);
             throw new ServiceException("Cache list could not be loaded");
@@ -67,35 +67,34 @@
             log.error("Client is null.");
             throw new ServiceException("Could not delete all key/value pairs from current redis database, null client.");
         } else {
-            RedisConnectionFactory factory = this.client.getConnectionFactory();
-            if (factory == null) {
-                log.error("Factory is null.");
-                throw new ServiceException("Could not delete all key/value pairs from current redis database, unable to establish a factory");
-            } else {
-                RedisConnection connection = factory.getConnection();
-                if (connection == null) {
-                    log.error("Connection is null.");
-                    throw new ServiceException("Could not delete all key/value pairs from current redis database, unable to establish a connection");
-                } else {
-                    try {
-                        connection.flushDb();
-                        log.trace("flushed cache for current db %n", ((JedisConnectionFactory) this.client.getConnectionFactory()).getDatabase());
-                    } catch (Exception var4) {
-                        log.error(var4.getMessage(), var4);
-                        throw new ServiceException("Unable to delete all key/value pairs from current redis database");
-                    }
-                }
+            RedisConnection connection = getConnectionFactory().getConnection();
+
+            try {
+                connection.flushDb();
+                log.trace("flushed cache for current db %n", ((JedisConnectionFactory) getConnectionFactory()).getDatabase());
+            } catch (Exception e) {
+                log.error("Unable to delete all key/value pairs from current redis database", e);
+                throw new ServiceException("Unable to delete all key/value pairs from current redis database");
             }
         }
     }
 
     public void deleteAllFromInstance() throws ServiceException {
         try {
-            this.client.getConnectionFactory().getConnection().flushAll();
-            log.trace("flushed caches from instance %s", ((JedisConnectionFactory) this.client.getConnectionFactory()).getHostName());
-        } catch (Exception var2) {
-            log.error(var2.getMessage(), var2);
+            getConnectionFactory().getConnection().flushAll();
+            log.trace("flushed caches from instance %s", ((JedisConnectionFactory) getConnectionFactory()).getHostName());
+        } catch (final Exception e) {
+            log.error("Could not flush db", e);
             throw new ServiceException("Unable to clear all databases in redis instance");
         }
     }
+
+    private RedisConnectionFactory getConnectionFactory() throws ServiceException {
+        final RedisConnectionFactory factory = this.client.getConnectionFactory();
+        if (factory == null) {
+            log.error("Factory is null.");
+            throw new ServiceException("unable to establish a factory");
+        }
+        return factory;
+    }
 }