fix cache issue
Merge branch 'hotfix-1.2.2'