If we fail to CAS, remove cached data so it's re-read from DB

Change-Id: I7a49b9cbf648c22ebb1d508e11769200657c18d2
Merge "If we fail to CAS, remove cached data so it's re-read from DB"