Remove references to doctrine
Minor tweaks to Memcache storage due to testing