Merge branch 'mh/ref-races-optim-invalidate-cached'