Fixed again removing items from cache