In the next diff, we'll add some code to invalidate the UserIdentityCache for the current user when this happens. We want to do this whenever we update the FID locally, so it makes sense to factor all those locations out first.

Depends on D13735

Flow; this is a simple refactor