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