cache validation fixes