Cache references in handleDelete

Change-Id: I0f682f275ec9464940d5936dfbde28fa22a2a695
Merge "Cache references in handleDelete"