Fix user and org clear_cache