Be sure that cache getting wiped too

Change-Id: Idbf3a07243bde3e18f65a841b16390342c19b6bb