Undid some dumb changes; cache now disabled while editing