Solved cache bugs