Going with the tree implementation for the DS

Threw away the older version of the Cache implemented with hashmaps.
Looks like the Tree implementation will work for now. Keeping this.
Updating references of CacheEngineV2

Will ideally remove this in a while. This needs to be a JUnit test case!