Tweak caching api just a bit