Add cache_method
Merge branch 'master' into staging