fix false cache options
Merge branch 'master' into release