Quick fix: Add HH caching