some caching and reduced requests for MTPS gh-79