File uploads - Fix query plan caching

[BrynCooke]

The query plan must be manipulated to ensure that subgraph requests are executed in the same order as the Currently the query plan get manipulated after caching has taken place. This means that:

1. The query plan that we report to studio is inaaccurate.
2. The query plan must be manipulated every request.

To close this issue, make sure that the query plan manipulation happens at the correct location. This may mean creating a service for query plans which is a larger task, and should be brought up during a design discussion.