Simplify strategy cache and enable code analyst