Changes in cache.c