PropertyLoader enhancement and Cache refactoring.