Issue #2493665 by Fabianx, dawehner, msonnabaum, catch: Add centralized container invalidation method