More use of the cache for minor speedups