@ulion: I changed this back to the old behavior but I'm wondering whether we should make this: m_pFile = new CFileCache((m_flags & READ_MULTI_STREAM) != 0 && (URIUtils::IsInternetStream(url, true) || g_advancedSettings.m_networkBufferMode == 1));

Any ideas?