Hashing fix followup

[awsr]

• Replace error handling with fallback counter.
  • This implementation seems to be more stable than previous attempts. So far it hasn't had any issues with miscounting (whereas previous ones almost always missed some).
• Move error handling logic.
• Only add to cache if hash is available.
• Move getHash for organization.