Cache no longer a class property - it's an object property or can be passed through options / Misc fixes