Try doing more caching
Merge pull request #996 from eric/speedup-wad

Try doing more caching