Interim checkin
More cache manager updates, cleanup
Fixing an error in all soups calculation
Changing retrieve query to exact query
Merge pull request #780 from khawkins/smartsync_smartstore

First pass: cache manager uses SmartStore