Fixed cache issue