Fixed deferred initial generation of marshaller after refresh