Made the htcache more overrideable.