Merge branch 'hotfix/fix-cache-key'
fix singleton problem in cache
Merge branch 'hotfix/no-cache-for-recursive' into develop