Merge "Update cached user ID after user is added to the database"