Various Internal Refactorings.
Added comment documentation mentioning caching behavior.