More render cache test fixes.