Fixing User Model for security and cached current user