Replace cacheIterator with Iterator Returned from erase

It's in general a bad idea to keep iterators to modified containers. In
particular, this was causing a crash in a very strange corner case I did
not fully understand, but this change fixed it.

REVIEW: 124012