@zwass the expiration calculation and event eviction logic will need to change too, so that PR for event optimization is a half measure 😕