Cache improvements

Lots of improvements to make Cache in line with the current draft for Psr\Cache

Refs #29