diff --git a/app/controllers/general.php b/app/controllers/general.php
index 0c10dd46e9..95bece43fc 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -41,6 +41,7 @@ Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
 
 App::init()
+    ->groups(['api', 'auth', 'avatars', 'functions', 'account', 'projects', 'storage', 'teams', 'users'])
     ->inject('utopia')
     ->inject('request')
     ->inject('response')
diff --git a/app/init.php b/app/init.php
index 86c7ebaa63..f57c773861 100644
--- a/app/init.php
+++ b/app/init.php
@@ -949,7 +949,6 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
         if ($project->isEmpty()) {
             $user = new Document(['$id' => ID::custom(''), '$collection' => 'users']);
         } else {
-            //Todo fix cache save re-invoked
             $user = $dbForProject->getDocument('users', Auth::$unique);
         }
     } else {
@@ -1093,10 +1092,6 @@ App::setResource('cache', function (Group $pools, Client $queueForCacheSyncOut)
     $cache  = new Cache(new Sharding($adapters));
 
     $cache->on(cache::EVENT_SAVE, function ($key) use ($queueForCacheSyncOut) {
-//        //Todo fix cache re-invoked
-//        if ($key === 'cache-console:_metadata:users') {
-//            return;
-//        }
         $queueForCacheSyncOut
             ->enqueue([
                 'key' => $key
@@ -1104,9 +1099,6 @@ App::setResource('cache', function (Group $pools, Client $queueForCacheSyncOut)
     });
 
     $cache->on(cache::EVENT_PURGE, function ($key) use ($queueForCacheSyncOut) {
-//        if ($key === 'cache-console:_metadata:users') {
-//            return;
-//        }
         $queueForCacheSyncOut
             ->enqueue([
                 'key' => $key