Improve analytics service

Caches early calls