Removed doctrine and added storage implementation (note: memcache has not been tested yet)