Made caching actually work