Fixed issues with cache of athlete, and the instantiation of service
implementations