More consistent use of internal cache ($_cached)
Merge pull request #29 from Ali1/enhancement-internalCache

More consistent use of internal cache ($_cached)