Revert to oldschool caching