Added cleancache support