[thin, cache] bring in line with the cache-patches branch