Add company and employee as cache keys

issue3905
review8331002