Don't query for the user every time in FieldDataCache, just use the user_id instead
Merge pull request #6129 from cpennington/fewer-queries-in-field-data-cache

Don't query for the user every time in FieldDataCache, just use the user_id instead