Define data cache at top of file

Alphabetize it at the bottom
Sort groups initially in serializer, not on the client
Merge branch 'improve-models'