DistCache namespacing and some test cleanup

8afb46d fixes the intermittent issues we were having with the tests blowing up when using DistCache