Cache split

And a few extra fixes