Merge "Remove caching from EBT helper" into nyc-dev