Decouple CSP and request objects #34