Remove duplicate cache cleanup
Use a map to prevent having to use search