Removed cache implementation, in our way of simplification