More refactoring of WaveFormCacheService by creating WaveFormRequestService.