v.g.vassilev added a comment. @rsmith suggested to move this one interface layer down, that is `ContentCache::getBuffer`. Moving it there might fix more issues. I will try to improve it and land the new version if that's not urgent for you. https://reviews.llvm.org/D33275