Improve cache suffix handler mecanism