Revert to oldschool caching 2
Various final fixes