- use cache
- introduced cache used by DefaultEventSourceCollector