Ported Service.pm and PreferencesCustomService.pm to ObjectManager and let it use Cache instead of CacheInternal.