map expiration improvements cont. (use empty map)