Properly normalize ref keys used in JS cache
Merge branch 'master' into sync-text