some cache adjustments
fixed cached