fix datasource manager issue when sharing cache (no ds resolver set)
Merge branch 'master' into mondrian-4