Merge "Do not update cache on screen lifecycle"