Added cache manager and renamed user token to user key