Remove cache hack as writeback should do the same