Cache WIP
WIP
Cache unittests
Consistent formatting