Fix for good cache issue