Ported Queue.pm and PreferencesCustomQueue.pm to ObjectManager and let it use Cache instead of CacheInternal.