Added caching of user details