Add option to disable caching