Fixing the matcher flow.
Refactor of code to enabling caching of streams
Making sure that we enable the caching of streams.
Starting to work out better matching capabilities.