Merge branch 'jc/cache-unmerge'