+ oa-cache refactoring, added docstrings