Allow for more than one cache cleanup during testing

Tests would fail sporadically because of multiple cleanups, which are
perfectly fine.
Merge pull request #179 from cndreisbach/fix-tests

Allow for more than one cache cleanup during testing