Add cleancache support. Y