Moved stuff around in memcache module
lots