Added missing clearing of cache when remove based on STATE/STATUS