Move OrganizationCache to its own file