Started to integrate cache eviction