Cache problems fixed