Merge "Remove function_cache variables from executor client" into feature/zuulv3