Correcting which keys should be fetched by the datastore
adding test to make sure we're pulling cache entries from the cache, memcache entries from memcache before (or in addition to) going to the datastore
Merge branch 'memcachevariancetesting' into memcachevariance