Add cache management (#91)