Merge "Move code to load User data from cache out of loadFromId"