Merge "Update/invalidate cache properly in update()"