Revert to wrapping rather than extending underlying Map to enable concurrency and null values.