Continued work on refactoring to use game cache.