Beta version for testing refactor-cache branch merge.