test fixes and return of the CachingExtractor