cleanup
renamed a method to reflect it's usage with caching