diff --git a/rhodecode/model/user_model.py b/rhodecode/model/user.py
copy from rhodecode/model/user_model.py
copy to rhodecode/model/user.py
--- a/rhodecode/model/user_model.py
+++ b/rhodecode/model/user.py
@@ -17,19 +17,19 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
-
 """
 Created on April 9, 2010
 Model for users
-@author: marcink
+:author: marcink
 """
-from rhodecode.lib import auth
+
 from pylons.i18n.translation import _
-from rhodecode.lib.celerylib import tasks, run_task
+from rhodecode.model.caching_query import FromCache
 from rhodecode.model.db import User
 from rhodecode.model.meta import Session
+import logging
 import traceback
-import logging
+
 log = logging.getLogger(__name__)
 
 class DefaultUserException(Exception):pass
@@ -41,69 +41,76 @@ class UserModel(object):
             self.sa = Session()
         else:
             self.sa = sa
-    
-    def get_default(self):
-        return self.sa.query(User).filter(User.username == 'default').scalar()
-    
-    def get_user(self, id):
-        return self.sa.query(User).get(id)
-    
-    def get_user_by_name(self, name):
-        return self.sa.query(User).filter(User.username == name).scalar()
-    
+
+    def get(self, user_id, cache=False):
+        user = self.sa.query(User)
+        if cache:
+            user = user.options(FromCache("sql_cache_short",
+                                          "get_user_%s" % user_id))
+        return user.get(user_id)
+
+
+    def get_by_username(self, username, cache=False):
+        user = self.sa.query(User)\
+            .filter(User.username == username)
+        if cache:
+            user = user.options(FromCache("sql_cache_short",
+                                          "get_user_%s" % username))
+        return user.scalar()
+
     def create(self, form_data):
         try:
             new_user = User()
             for k, v in form_data.items():
                 setattr(new_user, k, v)
-                
+
             self.sa.add(new_user)
             self.sa.commit()
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
-            raise      
-    
+            raise
+
     def create_registration(self, form_data):
         try:
             new_user = User()
             for k, v in form_data.items():
                 if k != 'admin':
                     setattr(new_user, k, v)
-                
+
             self.sa.add(new_user)
             self.sa.commit()
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
-            raise      
-    
-    def update(self, uid, form_data):
+            raise
+
+    def update(self, user_id, form_data):
         try:
-            new_user = self.sa.query(User).get(uid)
+            new_user = self.get(user_id, cache=False)
             if new_user.username == 'default':
                 raise DefaultUserException(
-                                _("You can't Edit this user since it's" 
+                                _("You can't Edit this user since it's"
                                   " crucial for entire application"))
             for k, v in form_data.items():
                 if k == 'new_password' and v != '':
                     new_user.password = v
                 else:
                     setattr(new_user, k, v)
-                
+
             self.sa.add(new_user)
             self.sa.commit()
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
-            raise      
-        
-    def update_my_account(self, uid, form_data):
+            raise
+
+    def update_my_account(self, user_id, form_data):
         try:
-            new_user = self.sa.query(User).get(uid)
+            new_user = self.get(user_id, cache=False)
             if new_user.username == 'default':
                 raise DefaultUserException(
-                                _("You can't Edit this user since it's" 
+                                _("You can't Edit this user since it's"
                                   " crucial for entire application"))
             for k, v in form_data.items():
                 if k == 'new_password' and v != '':
@@ -111,28 +118,28 @@ class UserModel(object):
                 else:
                     if k not in ['admin', 'active']:
                         setattr(new_user, k, v)
-                
+
             self.sa.add(new_user)
             self.sa.commit()
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
-            raise 
-                
-    def delete(self, id):
+            raise
+
+    def delete(self, user_id):
         try:
-            
-            user = self.sa.query(User).get(id)
+            user = self.get(user_id, cache=False)
             if user.username == 'default':
                 raise DefaultUserException(
-                                _("You can't remove this user since it's" 
+                                _("You can't remove this user since it's"
                                   " crucial for entire application"))
             self.sa.delete(user)
-            self.sa.commit()            
+            self.sa.commit()
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
-            raise        
+            raise
 
     def reset_password(self, data):
+        from rhodecode.lib.celerylib import tasks, run_task
         run_task(tasks.reset_user_password, data['email'])