Refactoring Team so the cache is separate