Consistently use container ID over handle