VID-819 Make sure we cache consistant ranges