Improved CdnFactory