Fixed cache invalidation in listener