Merge branch 'jk/ref-cache-non-repository-optim'