Merge pull request #1498 from glneo/cache-early-fixes

Early cache enable and coherency fixes