More checking

Something is clearly wrong with the rotation, but I've yet to determine
what it is. Probably an issue with the order of the replacement re: the
cache object.