Fix remove when selection - add cache string