diff --git a/app/workers/database.php b/app/workers/database.php
index b024871045..55c485f304 100644
--- a/app/workers/database.php
+++ b/app/workers/database.php
@@ -2,7 +2,7 @@
 
 use Appwrite\Resque\Worker;
 use Utopia\Cache\Cache;
-use Utopia\Cache\Adapter\Redis as RedisCache;
+use Utopia\Cache\Adapter\Redis;
 use Utopia\CLI\Console;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
@@ -141,17 +141,9 @@ class DatabaseV1 extends Worker
     {
         global $register;
 
-        $dbForInternal = null;
-
-        go(function() use ($register, $projectId, &$dbForInternal) {
-            $db = $register->get('dbPool')->get();
-            $redis = $register->get('redisPool')->get();
-
-            $cache = new Cache(new RedisCache($redis));
-            $dbForInternal = new Database(new MariaDB($db), $cache);
-            $dbForInternal->setNamespace('project_'.$projectId.'_internal'); // Main DB
-
-        });
+        $cache = new Cache(new Redis($register->get('cache')));
+        $dbForInternal = new Database(new MariaDB($register->get('db')), $cache);
+        $dbForInternal->setNamespace('project_'.$projectId.'_internal'); // Main DB
 
         return $dbForInternal;
     }
@@ -165,18 +157,9 @@ class DatabaseV1 extends Worker
     {
         global $register;
 
-        /** @var Database $dbForExternal */
-        $dbForExternal = null;
-
-        go(function() use ($register, $projectId, &$dbForExternal) {
-            $db = $register->get('dbPool')->get();
-            $redis = $register->get('redisPool')->get();
-
-            $cache = new Cache(new RedisCache($redis));
-            $dbForExternal = new Database(new MariaDB($db), $cache);
-            $dbForExternal->setNamespace('project_'.$projectId.'_external'); // Main DB
-
-        });
+        $cache = new Cache(new Redis($register->get('cache')));
+        $dbForExternal = new Database(new MariaDB($register->get('db')), $cache);
+        $dbForExternal->setNamespace('project_'.$projectId.'_external'); // Main DB
 
         return $dbForExternal;
     }
diff --git a/app/workers/deletes.php b/app/workers/deletes.php
index 1242d7a8ab..c855043254 100644
--- a/app/workers/deletes.php
+++ b/app/workers/deletes.php
@@ -3,14 +3,13 @@
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Query;
-use Utopia\Cache\Adapter\Redis as RedisCache;
+use Utopia\Cache\Adapter\Redis;
 use Utopia\Database\Validator\Authorization;
 use Appwrite\Resque\Worker;
 use Utopia\Storage\Device\Local;
 use Utopia\Abuse\Abuse;
 use Utopia\Abuse\Adapters\TimeLimit;
 use Utopia\CLI\Console;
-use Utopia\Config\Config;
 use Utopia\Audit\Audit;
 use Utopia\Cache\Cache;
 use Utopia\Database\Adapter\MariaDB;
@@ -360,7 +359,7 @@ class DeletesV1 extends Worker
     {
         global $register;
         
-        $cache = new Cache(new RedisCache($register->get('cache')));
+        $cache = new Cache(new Redis($register->get('cache')));
         $dbForInternal = new Database(new MariaDB($register->get('db')), $cache);
         $dbForInternal->setNamespace('project_'.$projectId.'_internal'); // Main DB
 
@@ -375,7 +374,7 @@ class DeletesV1 extends Worker
     {
         global $register;
 
-        $cache = new Cache(new RedisCache($register->get('cache')));
+        $cache = new Cache(new Redis($register->get('cache')));
         $dbForExternal = new Database(new MariaDB($register->get('db')), $cache);
         $dbForExternal->setNamespace('project_'.$projectId.'_external'); // Main DB
 
@@ -389,7 +388,7 @@ class DeletesV1 extends Worker
     {
         global $register;
 
-        $cache = new Cache(new RedisCache($register->get('cache')));
+        $cache = new Cache(new Redis($register->get('cache')));
         $dbForConsole = new Database(new MariaDB($register->get('db')), $cache);
         $dbForConsole->setNamespace('project_console_internal'); // Main DB