Added Cache optimization