Changed how the file paths get looked up during all stages of building the cache.