adding a few more overrides
using the cache by default now