Cache disabled and messages improved