Move cached resources fields.
Cleanup.