Made caching configurable