Cache method _set() update
Merge branch 'dev'