Cache tests
Actual cache tests :-)
Cache seems solid now.
Style fixes