Let's leave it for now and clean up when the per-file data caching is added.