Finished changes for deleting cache

This doesn't actually assert that the correct container was removed from the cache.