Don't cache content reader
Revise MatchIterator implementation