LRU cache, cleanup flow rework