Added a few cache points in app. Need to take a closer look att AppTest.