More work on updating caps