Map eviction improvement