Merge "Removed overzealous caching from JobQueueFederated"