Merge pull request #2151 from cryode/feature/output-cache-improvements

Add headers to Output class cache files.