Fixing issue #845

[marcoeilers]

• When we need a snapshot map without a domain, we can take a cached one that does have a domain if the domain condition is true
• When we create a new snapshot map to define the snapshot of consuming a single location, it does not need a domain.

Fixes #845 and #844.