[D11] another change from the milestone branch (don't populate the cache here, order of assets doesn't necessarily match the order of asset names)