Merge "user: Move idFromName cache truncation to before adding the new value"