Refactored EH Cache Measurment Cache to new class