Issue #2879512 by bkosborne: Path aliases can be forgotten after a cache rebuild due to race condition in CacheCollector (cherry picked from commit 38fd4ceb)