diff --git a/rhodecode/model/permission_model.py b/rhodecode/model/permission_model.py
--- a/rhodecode/model/permission_model.py
+++ b/rhodecode/model/permission_model.py
@@ -2,7 +2,7 @@
 # encoding: utf-8
 # Model for permissions
 # Copyright (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
- 
+
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
@@ -23,8 +23,8 @@ Model for permissions
 @author: marcink
 """
 
-from pylons.i18n.translation import _
 from rhodecode.model.db import User, Permission, UserToPerm, RepoToPerm
+from rhodecode.model.caching_query import FromCache
 from rhodecode.model.meta import Session
 import logging
 import traceback
@@ -33,40 +33,47 @@ log = logging.getLogger(__name__)
 
 class PermissionModel(object):
 
-    def __init__(self):
-        self.sa = Session() 
-    
-    def get_default(self):
-        return self.sa.query(User).filter(User.username == 'default').scalar()
-    
-    def get_permission(self, id):
-        return self.sa.query(Permission).get(id)
-    
-    def get_permission_by_name(self, name):
-        return self.sa.query(Permission)\
-        .filter(Permission.permission_name == name).scalar()
-    
-    
+    def __init__(self, sa=None):
+        if not sa:
+            self.sa = Session()
+        else:
+            self.sa = sa
+
+    def get_permission(self, permission_id, cache=False):
+        perm = self.sa.query(Permission)
+        if cache:
+            perm = perm.options(FromCache("sql_cache_short",
+                                          "get_permission_%s" % permission_id))
+        return perm.get(permission_id)
+
+    def get_permission_by_name(self, name, cache=False):
+        perm = self.sa.query(Permission)\
+            .filter(Permission.permission_name == name)
+        if cache:
+            perm = perm.options(FromCache("sql_cache_short",
+                                          "get_permission_%s" % name))
+        return perm.scalar()
+
     def update(self, form_result):
         perm_user = self.sa.query(User)\
                 .filter(User.username == form_result['perm_user_name']).scalar()
         u2p = self.sa.query(UserToPerm).filter(UserToPerm.user == perm_user).all()
         if len(u2p) != 3:
-            raise Exception('There is more than 3 defined \
-            permissions for defualt user. This should not happen please verify\
-            your database')
-        
+            raise Exception('There is more than 3 defined'
+            ' permissions for default user. This should not happen please verify'
+            ' your database')
+
         try:
             #stage 1 change defaults    
             for p in u2p:
                 if p.permission.permission_name.startswith('repository.'):
                     p.permission = self.get_permission_by_name(form_result['default_perm'])
                     self.sa.add(p)
-                    
+
                 if p.permission.permission_name.startswith('hg.register.'):
                     p.permission = self.get_permission_by_name(form_result['default_register'])
                     self.sa.add(p)
-                    
+
                 if p.permission.permission_name.startswith('hg.create.'):
                     p.permission = self.get_permission_by_name(form_result['default_create'])
                     self.sa.add(p)
@@ -75,14 +82,14 @@ class PermissionModel(object):
                 for r2p in self.sa.query(RepoToPerm).filter(RepoToPerm.user == perm_user).all():
                     r2p.permission = self.get_permission_by_name(form_result['default_perm'])
                     self.sa.add(r2p)
-            
+
             self.sa.commit()
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
-            raise               
-        
-        
-        
-        
-        
+            raise
+
+
+
+
+