Reset (+1 squashed commit)
Squashed commits:
[68846cd] Add cache events