added cache #24