add generic caching infrastructure for discovery information