Here is an improved version of the previous patch (please apply it rather than the previous). This version further optimizes cache checking by only calling find-buffer-visiting if necessary. (It also fixes some long lines.) On a test project containing 5000 files, running org-publish on the project with the cache enabled now takes seconds rather than minutes. Best, Matt