Changes to enable cached sub-file extraction

files