New cache cleanup mechanism