Switch from using pods_cache_ to an internal cache for related items

Fixes #2498