Merge change 22314 into eclair

* changes:
  Purge cache