pep_
Add new helper and fix cache