removed index and added cache