Clean up & added app cache