Merge branch 'js/get-short-oid-drop-cache'