Fix cache filler and peek message issue.