- Made the cacheService throw some events
- Several cleanups