Cleancache backport