Add ability to disable cache