Fix bug in cache when organization is unspecified