Merge "Add app cache clearing mechanism"