Adding waveform cache class.
Fixing typo