Updating references after loading cache