Fixing caching, since it was never actually working properly.