Applied an alternative fix to the bug related to Cache trying to get a
Vertex from a Generic that is not flushed.