Add cache events (+1 squashed commit)
Squashed commits:
[a303c15] Add cache events