Fix constant cache issue