Merge pull request #1528 from apache/juerg/integration-cache

Fix integration cache cleanup