Merge "Only update cache for new user on user create" into sc-dev