Move cache loading into request handler