Returned clache back to life, fixed most tests