fix cache deletion when needed + more relabelling

Status Job ID Name Coverage
  Test
canceled #186003435
python2.7