More refactoring of WaveFormCacheService, which becomes WaveFormEngineService.