implement automatic fixing of broken caches
Merge branch 'master' into jupis