Fix broken cache tests