Memcache improvements - refs BT#8340