[IMP] Bundle invalidation won't use watchdog afterall
[IMP] refactor bundle ir.attachment cache invalidation