Add wildcard and hostname caching