Fixed specs. Tests passing, cache clearing added. Needs extra cache tests