Issue #2233623 by Berdir: Follow-up to fix Merge AliasManagerCacheDecorator into AliasManager.