Merge branch 'release/1.0.0-beta4'
fix wrong cache key
Merge branch 'hotfix/fix-cached-object'
fix wrong cache key
Merge branch 'hotfix/fix-cache-key' into develop