Merge branch 'bw/submodule-sans-cache-compat'