Added option to disable caching