Add config option to enable / disable caching