refactor to use vcap_injection

Change-Id: I5b5bee4a234a7b4aa90d7d8f470534c0e9d23a51