Cache: refine previous fix