Improve unit result cache