added option to disable caching