Merge pull request #4884 from Cynthia-0203/fix/host-cache-cancel-cleanup