Motivation

We have identified a few areas of improvements wrt to state handling during the container lookup cycle, see #1595 (comment).

This issue serves to track progress in this regard.

It is also related to #291.

@gnosek @therealbobo @mstemm @leogr