The ProxyFactory class in the server module that does the Proxy construction for ejb2, has the construction/population of InvocationContext, repeated multiple times in the class. I think if this class is going to stay, then the block dealing with the InvocationContext construction needs to be refactored out into a separate method.