Getting rid of request dependency