Fix cache population problem