First part improvements of PR #2420

First part improvements of PR #2420:
Mainly includes:
 - expiration cleanup improvements
 - map store & expiration/eviction relations
 - adding an upper bound to WBQs
to be fair it's not related to this PR. Shall I create a new issue to track it?