Issue #19 Refactor into ManagerCache