Partial commit
Generic cache compiles
Fixes