Changes EspiMarshaller to use a singleton marshaller