Merge branch 'js/check-attr-cached'