Rev'd version, another fix to caching