First part improvements of PR #2420

First part improvements of PR #2420:
Includes:
 - expiration cleanup improvements
 - map store & expiration/eviction relations