Cache fixes for collection items and expansions

This fixes the following issues:

* When requesting a collection the individual resources in the collection were not being put into their respective cache regions
* When requesting a resource with expanded resources, the expansions were not being cached
* When requesting a resource with an expanded collection, the resources in the collection were not being cached