Added strategy cache pattern