Now only saving context if it has changes.