New cache stuff.
Cleanup