Pep8 + variable name changes + added cache support