Cache no longer stores filenames, builds them on the fly
Merge branch 'attempt-to-open'