Make expiration non blocking

Expiration today is inherently blocking due to living in the DataContainer. We need to move this elsewhere or refactor in such a way to let expiration be non blocking. Moving this to be non blocking will most likely highlight many other bugs in expiration code as our tests had no easy to do such things when everything was blocking (aka lots of random failures).