Cleanup of memcache impl