Caching tweak