Code cleanup to prepare for merge to test siri caching via memcached on
dev