Clearing up, more use of cached username/user_id