Which can then be rebased and cached properly