Fix caches recycle bugs