Updates to cache.c