This reverts commit 69874a56.

Revert "Simplify internal cache clear on context change, this avoids issues when displaying same EC with different contexts"

This reverts commit 43425bd6.

Simplify internal cache clear on context change, this avoids issues when displaying same EC with different contexts

Sven Berg Ryen authored May 09, 2017 and Marlon committed May 09, 2017

Issue #2873691 by svenryen: Unpublished entities are counted causing less items than desired to be displayed

ref. https://pareview.sh/node/1316

The original statement: `$settings = $this->settings + $settings` was losing the stored
values of the "Items to display" and "Offset" textfields on the settings.