Fixed cache bug
Merge branch 'release'