AbstractRequest, EmtRequest was growing too much.
AbstractRequestBuilder, cache skipping and some clean up.