Rejigged handling of cache and fixed language