[ticket/11413] Revert some cache service related changes from earlier

PHPBB3-11413