We use this kind of container a lot, so creating a single
implementation makes sense.

Change-Id: I67ead58becd7d2a287812145c11d93ab1c593c0f