Switch off caching, for now.  There are too many files to parse.
Factor out the widening code.