Move FieldDataCache assert to check both get and get_or_create
Merge pull request #2761 from edx/jbau/add-userid-to-FieldDataCache

Move FieldDataCache assert to check both get and get_or_create