Fix a problem w/ caching + file list view in editor

We'll need to overhaul how we handle caching, but this fixes an issue right now.
Merge branch 'master' into davis_master