Add caching of usernames and update-in-place