Fixed some caching kerfuffles