Fix a few bugs in the cache