Add cache_method 2
Merge branch 'master' into staging