move cache clear as well