Fixed minor cache issues