diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php
index a3aeed15f..c3ecb5e53 100644
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@@ -94,9 +94,9 @@ App::post('/v1/projects')
 
         $collections = Config::getParam('collections2', []); /** @var array $collections */
 
-        $dbForInternal->setNamespace('project_internal_'.$project->getId());
+        $dbForInternal->setNamespace('project_'.$project->getId().'_internal');
         $dbForInternal->create();
-        $dbForExternal->setNamespace('project_external_'.$project->getId());
+        $dbForExternal->setNamespace('project_'.$project->getId().'_external');
         $dbForExternal->create();
 
         foreach ($collections as $key => $collection) {
diff --git a/app/init.php b/app/init.php
index 1af0027a8..274b3381b 100644
--- a/app/init.php
+++ b/app/init.php
@@ -30,7 +30,7 @@ use Utopia\Registry\Registry;
 use MaxMind\Db\Reader;
 use PHPMailer\PHPMailer\PHPMailer;
 use PDO as PDONative;
-use Utopia\Cache\Adapter\None;
+use Utopia\Cache\Adapter\Redis as RedisCache;
 use Utopia\Cache\Cache;
 use Utopia\Database\Adapter\MariaDB;
 use Utopia\Database\Database as DatabaseDatabase;
@@ -510,19 +510,20 @@ App::setResource('projectDB', function($register, $project) {
 }, ['register', 'project']);
 
 App::setResource('dbForInternal', function($register, $project) {
-    $cache = new Cache(new None());
+    $cache = new Cache(new RedisCache($register->get('cache')));
 
     $database = new DatabaseDatabase(new MariaDB($register->get('db')), $cache);
-    $database->setNamespace('project_internal_'.$project->getId());
+    $database->setNamespace('project_'.$project->getId().'_internal');
 
     return $database;
 }, ['register', 'project']);
 
 App::setResource('dbForExternal', function($register, $project) {
-    $cache = new Cache(new None());
+    $cache = new Cache(new RedisCache($register->get('cache')));
 
     $database = new DatabaseDatabase(new MariaDB($register->get('db')), $cache);
     $database->setNamespace('project_external_'.$project->getId());
+    $database->setNamespace('project_'.$project->getId().'_external');
 
     return $database;
 }, ['register', 'project']);
diff --git a/app/views/console/storage/index.phtml b/app/views/console/storage/index.phtml
index 05ed9453e..803ee6f4a 100644
--- a/app/views/console/storage/index.phtml
+++ b/app/views/console/storage/index.phtml
@@ -106,11 +106,11 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                                                         <input type="hidden" data-ls-attrs="id=file-folderId-{{file.$id}}" name="folderId" data-cast-to="integer" value="1">
 
                                                         <label for="file-read">Read Access (<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
-                                                        <input type="hidden" data-ls-attrs="id=file-read-{{file.$id}}" name="read" data-forms-tags data-cast-to="json" data-ls-bind="{{file.$permissions.read}}" placeholder="User ID, Team ID or Role" />
+                                                        <input type="hidden" data-ls-attrs="id=file-read-{{file.$id}}" name="read" data-forms-tags data-cast-to="json" data-ls-bind="{{file.$read}}" placeholder="User ID, Team ID or Role" />
                                                         <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
                                                         
                                                         <label for="file-write">Write Access (<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
-                                                        <input type="hidden" data-ls-attrs="id=file-write-{{file.$id}}" name="write" data-forms-tags data-cast-to="json" data-ls-bind="{{file.$permissions.write}}" placeholder="User ID, Team ID or Role" />
+                                                        <input type="hidden" data-ls-attrs="id=file-write-{{file.$id}}" name="write" data-forms-tags data-cast-to="json" data-ls-bind="{{file.$write}}" placeholder="User ID, Team ID or Role" />
                                                         <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
                                                     </form>
 
diff --git a/composer.lock b/composer.lock
index b15378c86..85756568b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1923,7 +1923,7 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/database",
-                "reference": "81a16f851c712f5857c044c0e71c0abc698cd619"
+                "reference": "43744d220c41048d677643c70a0aa3ab90652e13"
             },
             "require": {
                 "ext-mongodb": "*",
@@ -1970,7 +1970,7 @@
                 "upf",
                 "utopia"
             ],
-            "time": "2021-05-03T09:59:14+00:00"
+            "time": "2021-05-03T11:07:15+00:00"
         },
         {
             "name": "utopia-php/domains",