Merge changes I99813278,I6285042b

* changes:
  Fix copypasta error.
  Aggressively clear cached data when forgetting.