Add option to disable cache