Merge change 8189

* changes:
  Enforce app cache maximum size