Handle monitoring differently
Introduce some different logic
Include invalidation here
Fixes