Added cached implementation without cache yet