pep8, removed cached_* calls