Merge "Create and use a StarCache in the ChangeScreen"