added cache handler