Don't worry about trying to remove map_cached_nil_for in this pull request.  Just remove the dependance on it where here and worry about removing it in another pull request.