Fixed Cache Problems