Added caching in Extractor