Fixed Measurement Service to use Test Cache